dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,234 Commits 1 Branch 0 Tags
2a8b66b7bf04a4b521bfe59c6708a89fb183d82e
Commit Graph

335 Commits

Author SHA1 Message Date
Jonathan G Rennison
919057a5e6 Cache tunnel info in viewport map mode, to prevent render flicker. 
If we see a tunnel during the usual tile scan, keep it in the cache
until it is explicitly evicted by a clear tunnel tile action, or
the cache is cleared at game init/load/shutdown.
Select colours at the drawing rather than the cache-building stage.
Bridges and tunnels are now stored/handled separately.
The process for bridges is mostly unchanged.
 2015-11-11 19:18:32 +00:00
Jonathan G Rennison
e24839ed65 Merge branch 'master' into enhanced_viewport_overlay 
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
 2015-08-05 21:25:13 +01:00
frosch
90d50d78c0 (svn r27313) -Fix [FS#6317]: Adding tram to town-owned bridges assigned an incorrect owner to the tram and did not count infrastructure counts properly. (marcole) 2015-06-21 09:52:30 +00:00
frosch
bba85a6e01 (svn r27209) -Add: Draw path reservation on the whole bridge, not only on the bridge heads. 2015-03-28 14:04:06 +00:00
frosch
5503af7bfa (svn r27208) -Fix: Draw correct overlay sprites for path reservations on bridges and tunnels. 2015-03-28 14:03:26 +00:00
frosch
bd3a8bf9e4 (svn r27157) -Fix: Mark bridge middle tiles dirty when building/removing/changing bridges. 2015-02-22 14:01:24 +00:00
rubidium
647a3c8e5f (svn r26882) -Feature: allow limiting the height of bridges (ic111) 2014-09-21 11:40:11 +00:00
rubidium
dc2b4f2498 (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 2014-09-21 11:24:51 +00:00
rubidium
2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
frosch
2ce5034005 (svn r26277) -Add [FS#5849]: Display speed limit also for road bridges in the TileInfo window. 2014-01-26 13:50:10 +00:00
rubidium
baad79b1b6 (svn r26111) -Fix: theoretical case where sprite table could be overread for aqueducts that start at flat land 2013-11-25 16:26:50 +00:00
rubidium
157a3d3be4 (svn r26072) -Cleanup: mark some unreachable default cases by NOT_REACHED() 2013-11-23 18:13:30 +00:00
frosch
0ca316e1d9 (svn r25231) -Fix (r25227): Also update infrastructure counts. (adf88) 2013-05-07 13:49:18 +00:00
frosch
dd7d470808 (svn r25227) -Fix [FS#5541]: Give bridges owned by noone (from bankrupt companies) to the first company which replaces the bridge. Everyone could have removed/rebuild the bridge anyway. 2013-05-06 15:41:34 +00:00
frosch
4c4010970a (svn r25141) -Fix: When extra dynamite was disabled, towns would be allowed to clear bridges with trams. 2013-04-03 20:25:06 +00:00
frosch
5bf6513dfc (svn r24912) -Fix [FS#5389]: Upgrading bridges could steal road types. (adf88) 2013-01-13 13:17:12 +00:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
planetmaker
92a2302dbd (svn r24895) -Fix [FS#5436]: Allow downgrade of road bridges in the scenario editor 2013-01-08 17:56:43 +00:00
frosch
1e327a20c4 (svn r24413) -Add [FS#5221-ish]: Allow overbuilding bridges with the same type when adding a roadtype. 2012-07-18 19:24:13 +00:00
rubidium
76d5833650 (svn r24179) -Codechange: move some variables of Town to TownCache 2012-04-25 20:50:13 +00:00
michi_cc
ff73fdb4b0 (svn r23952) -Feature: [NewGRF] Customisable tunnel portals for rail types (sprites by Snail). 2012-02-15 21:23:48 +00:00
frosch
4705dc84b1 (svn r23864) -Fix: Railtype overlays were drawn 'only transparent' on invisible bridges. 2012-01-28 18:11:18 +00:00
rubidium
d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
truebrain
102c7ae60e (svn r23629) -Add: allow ScriptRoad::BuildRoad, ScriptBridge::BuildBridge (for roads) and ScriptTunnel:BuildTunnel (for roads) to work for GameScript 2011-12-19 21:02:33 +00:00
frosch
b43fdd903a (svn r23586) -Fix: Draw PBS reservation also for bridges with railtype overlays. 2011-12-17 23:22:27 +00:00
frosch
cecf7c4bc4 (svn r23584) -Fix: Draw PBS reservations also for tunnels with railtype overlays. 2011-12-17 23:14:28 +00:00
michi_cc
796fe54a2f (svn r23413) -Add: Company infrastructure counts for canals. 2011-12-03 23:40:23 +00:00
michi_cc
7a6b45c133 (svn r23412) -Add: Company infrastructure counts for road. 2011-12-03 23:40:18 +00:00
michi_cc
85ec2f07af (svn r23411) -Add: Company infrastructure counts for rail. 2011-12-03 23:40:13 +00:00
yexo
36e61e08b3 (svn r23160) -Fix: wrong comments in a lot of TileTypeProcs definitions 2011-11-08 17:37:32 +00:00
rubidium
e8eb3fe381 (svn r23110) -Codechange: let the flying altitude return ints are well 2011-11-04 13:40:59 +00:00
rubidium
0e2d2b2317 (svn r23108) -Codechange: more uint -> int / byte -> int conversions for Z related variables 2011-11-04 11:52:19 +00:00
rubidium
fb9fb416a1 (svn r23107) -Codechange: let GetSlopePixelZ and TerraformTile tile type functions use int z as well 2011-11-04 11:36:10 +00:00
rubidium
70faeeaba9 (svn r23106) -Codechange: pass int* to GetTileSlope and friends 2011-11-04 11:30:37 +00:00
rubidium
5d7acba5d3 (svn r23100) -Codechange: remove pointless multiplications by TILE_HEIGHT for the terraform code 2011-11-04 10:30:10 +00:00
rubidium
f923ede158 (svn r23098) -Codechange: remove pointless multiplications by TILE_HEIGHT from the tunnel code 2011-11-04 10:28:31 +00:00
rubidium
fd992c9fd8 (svn r23097) -Codechange: remove pointless multiplications by TILE_HEIGHT from the bridge code 2011-11-04 10:28:20 +00:00
rubidium
a70fdbcf2f (svn r23096) -Codechange: remove useless divisions and multiplications by TILE_HEIGHT for the snow line code 2011-11-04 10:25:58 +00:00
rubidium
de980ef0f9 (svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight) 2011-11-04 10:18:13 +00:00
terkhen
f45bf2d1af (svn r22821) -Fix [FS#4741]: Allow to demolish aqueducts built in the scenario editor. 2011-08-24 12:19:12 +00:00
rubidium
c691b4c49e (svn r22700) -Fix [FS#4680]: cost of changing bridge type is undercalculated when adding road types as well (based on patch by adf88) 2011-07-30 14:10:12 +00:00
rubidium
d946841eff (svn r22413) -Document: even more stuff 2011-05-02 20:59:54 +00:00
rubidium
87272273b5 (svn r22405) -Document: some more "random-ish" tidbits 2011-05-01 19:14:12 +00:00
rubidium
3cb12ed89c (svn r22019) -Codechange: s/functions.h/clear_func.h/ 2011-02-07 22:38:02 +00:00
rubidium
7086bb3017 (svn r21959) -Change: replace longbridges with custom maximum bridge and tunnel length setting 2011-02-04 15:37:23 +00:00
rubidium
285f369969 (svn r21956) -Cleanup: always draw the bridge pillars 2011-02-04 14:38:33 +00:00
terkhen
fbad07d3df (svn r21780) -Change: Keep aqueducts and road/tram tunnels and bridges after removing a company. 2011-01-14 13:19:23 +00:00
rubidium
2773233044 (svn r21743) -Fix [FS#4386]: coast tiles weren't drawn under bridges 2011-01-09 12:17:52 +00:00
rubidium
0f52366443 (svn r21471) -Change [FS#4153]: make building aqueducts behave more like building tunnels. They can't be built on flat (or foundationed) tiles, so there is at most one destination tile like there is only one for tunnels 2010-12-11 19:49:44 +00:00
rubidium
3d6ba9ab0d (svn r21468) -Change: make sure the end of a bridge is always a valid tile as well, and for aqueducts show "wrong land slope" when that would be more appropriate than "bridge heads not at same height" 2010-12-11 18:28:34 +00:00