dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,036 Commits 1 Branch 0 Tags
50cfa9403dab548f9607c02739923f3fefeca093
Commit Graph

184 Commits

Author SHA1 Message Date
tron
17c15fab3e (svn r5260) -Fix: It was possible to convert the railtype of a bridge while a train was on it 2006-06-14 09:52:50 +00:00
tron
f5638395fe (svn r5259) -Codechange: GetBridgeHeight{Ramp,}() now returns the height of the bridge, not one level lower 2006-06-14 09:01:21 +00:00
tron
0a72639c2d (svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc. 2006-06-10 08:37:41 +00:00
tron
901e2d02b1 (svn r5199) Make the control flow of GetTileTrackStatus_TunnelBridge() more comprehensible 2006-06-09 15:27:17 +00:00
tron
be88e269b9 (svn r5155) - Remove the bridge branch merge (revision r5070) 2006-06-07 19:35:21 +00:00
celestar
8c01bf711d (svn r5081) -Fix: Could not build bridges over crossings (but crossings under bridges were possible), noticed by WhiteRabbit 2006-06-02 21:03:59 +00:00
celestar
25a63ec7af (svn r5070) Merged the bridge branch 
-Feature: Bridges can now be placed above:
	Any railway track combination (excluding depots and waypoints)
	Any road combination (excluding depots)
	Clear tiles (duh), including fields
	Tunnel entrances
	Bridge heads

Thanks to Tron for idea and implementation, KUDr for the yapf synchronization and many others for hours of testing

There are still a number of visual problems remaining, especially when electric railways are on or under the bridge.
DO NOT REPORT THOSE BUGS FOR THE TIME BEING please.
 2006-06-02 13:05:41 +00:00
KUDr
5e73dce0e7 (svn r4987) Feature: Merged YAPF into trunk. Thanks to devs for continuous support and users for testing. 2006-05-27 16:12:16 +00:00
tron
1706164ff7 (svn r4937) Reduce the use of _error_message a bit 2006-05-21 11:34:08 +00:00
tron
1dc8b1a00e (svn r4927) Replace 3 big ifs (which regard foundations) by a bit less confusing code 2006-05-20 18:03:22 +00:00
celestar
cbf4e1e159 (svn r4882) -Fix: Forgot a change in previous commit 2006-05-16 12:31:15 +00:00
celestar
476ad49ac0 (svn r4881) -Codechange: Be a little more strict about types and remove some null-operations 2006-05-16 12:04:53 +00:00
tron
c9defc0fea (svn r4790) Remove slope magic from EnsureNoVehicleZ() and rename it to EnsureNoVehicleOnGround() to make more clear what it does 2006-05-09 09:56:09 +00:00
rubidium
e5bd292dab (svn r4789) - Codechange: rename RoadType to RoadTileType and ROAD_{NORMAL,CROSSING,DEPOT} to ROAD_TILE_* for consistency 2006-05-09 08:25:31 +00:00
rubidium
9b1bbf72ee (svn r4788) - Codechange: RAILTYPE_{NORMAL,ELECTRIC,...} and RAIL_TYPE_{NORMAL,SIGNAL,...} have nearly the same name, rename RAIL_TYPE_* to RAIL_TILE_* of extra clarity 2006-05-09 08:17:33 +00:00
tron
8bd664f81f (svn r4771) -Regression: It was possible to remove a bridge while a vehicle was on it 2006-05-07 11:55:28 +00:00
tron
24854be59e (svn r4766) -Fix: Vehicles on a sloped tile under a bridge were affected by the bridge speed limit 2006-05-07 08:18:12 +00:00
tron
5622ad4b5e (svn r4765) Add GetTileMaxZ(), which returns the height of the highest corner of a tile, and use it to simplify the code in a few places 2006-05-07 07:55:05 +00:00
tron
18ad0ae50e (svn r4572) Remove vehicle_leave_tile_proc 
There's exactly one implemented function (unbarring a level crossing) and one place where it can be triggered (a train leaves a level crossing)
It's a bit overkill, so just handle this one case where it can happen
 2006-04-25 07:32:33 +00:00
tron
c1dc517dab (svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE} 2006-04-23 19:35:36 +00:00
tron
0347fb2ab6 (svn r4541) Add a type for slopes and replace many magic numbers by the appropriate enums 2006-04-23 13:48:16 +00:00
Darkvater
e21b7eebfa (svn r4430) - NewGRF: Use the bridge's sprite layout for drawing high pillars. This fixes newgrf's high-bridge pillars drawing. Also remove the now obsolete _bridge_poles_table which was already integrated into the bridge sprite tables 2006-04-15 16:07:00 +00:00
tron
c26601eabd (svn r4402) Fix a faulty entry in the table for slopes under bridges, remove a now unnecessary test which hid the faulty entry till now and undo r4398 (don't do this!) 2006-04-12 19:05:31 +00:00
celestar
a588d816ff (svn r4398) -Fix: Quick and Dirty solution for FS#116. Just for the nightlies 2006-04-12 17:58:58 +00:00
celestar
5c3c4d190e (svn r4392) -Codechange: Use water map accessors in bridge code 2006-04-12 15:23:32 +00:00
celestar
75f978626a (svn r4391) -Fix: faulty ")" in previous commit 2006-04-12 15:21:33 +00:00
celestar
17da0bb976 (svn r4390) -Codechange: Upon merging elrails, one direct map access to the railtype went unnoticed... 2006-04-12 15:08:48 +00:00
tron
4615a26552 (svn r4374) Never directly commit something you prepared the evening before, mysteriously it will break in the morning, fix r4373 2006-04-12 05:26:36 +00:00
tron
82afa4caf2 (svn r4373) Rewrite GetSlopeZ_TunnelBridge() and slightly change its behavior: 
- Report the correct z alongside the ramp when a foundation is present
- Always report the z under the bridge for a bridge middle part, except if the z hack is used
This should fix some weird behavior of the tile selector near bridges
 2006-04-12 05:19:19 +00:00
tron
7a3345f4df (svn r4344) Use tile coordinates or even TileIndices instead of virtual tile coordinates where it suffices. 2006-04-10 12:36:04 +00:00
tron
81e6d68f95 (svn r4342) Change the first two parameters of commands - virtual pixel coordinates of the tile to operate on - to a TileIndex 
Remove DoCommandByTile(), because now it does the same as DoCommand()
 2006-04-10 07:15:58 +00:00
Darkvater
fc68881906 (svn r4265) - Fix: compile warning on VS2005 (parameter 2 different from declaration) 2006-04-03 18:11:42 +00:00
celestar
cc87f682b9 (svn r4249) -Codechange: Replace more occurences of 16 by TILE_SIZE and of 8 by TILE_HEIGHT. Reverted one change from the previous commit because it was faulty 2006-04-03 09:07:21 +00:00
tron
892a4c587d (svn r4242) Pass TileIndex and slope to GetSlopeTileh_*() instead of TileInfo 2006-04-02 12:49:18 +00:00
belugas
80570009dd (svn r4181) CodeChange : Replaced [G/S]etMapExtraBits by [G/S]etTropicZone. Although it was an accessor, nor his usage nor the values were clear. 2006-03-30 19:16:44 +00:00
tron
d9e705ae52 (svn r4164) Use acessor functions 2006-03-30 09:08:43 +00:00
belugas
3633d56923 (svn r4157) CodeChange : Keep on cleaning up Celestar's elrail merge 2006-03-29 20:35:39 +00:00
celestar
a7d8ad0004 (svn r4150) -Feature: Merged elrails into trunk. Thanks to Tron for lots of code and proofreading, thanks to peter1138 for another lot of code and ideas. 2006-03-29 16:30:26 +00:00
tron
9d216c1c56 (svn r4047) Remove two calls to FindLandscapeHeight() and some confusing use of the comma operator 2006-03-23 06:30:39 +00:00
tron
77e5cf4bc1 (svn r3979) Move GetRailFoundation() to rail_map.h and use it and friends to get information about rail tiles 2006-03-19 12:06:12 +00:00
tron
dacbf1a433 (svn r3922) Fix copy&pasto in r3916 (Slowly it's getting a bad habit) 2006-03-17 13:28:50 +00:00
tron
89090790c2 (svn r3916) Get/Set the rail type by [GS]etRailType{Crossing,OnBridge,}() 2006-03-17 10:10:31 +00:00
tron
b8da06ddb1 (svn r3907) Replace many bridge related direct map accesses with calls to shiny new functions and mark some strange constructs with XXX 2006-03-16 15:16:27 +00:00
tron
d6134455a5 (svn r3906) Before removing a rail/setting the owner of a road to none check if there's a transport route at all under the bridge 2006-03-16 13:35:35 +00:00
tron
483c8f7018 (svn r3904) Move GetBridgePiece() and GetBridgeType() to bridge_map.h and make the only place which still extracted that info diretly use the wrapper 2006-03-16 10:00:50 +00:00
tron
a3c45635a7 (svn r3903) Fix a copy&pasto in last commit and remove a redundant comment (the line above already says what's going on) 2006-03-16 07:18:38 +00:00
tron
1257d9e565 (svn r3902) When drawing a bridge middle part get the bridge axis only once instead of again and again 2006-03-16 07:12:28 +00:00
tron
efb64283df (svn r3901) Remove the last user of FindEdgesOfBridge() by using functions with similar functionality 2006-03-16 06:38:51 +00:00
tron
fedebdd09b (svn r3900) When clearing a bridge determine the bridge direction and tile offset once instead of all over the place; also use UpdateSignalsOnSegment() instead of SetSignalsOnBothDir(), because this is sufficient 2006-03-16 06:30:47 +00:00
tron
8a77808f65 (svn r3899) Use wrapper functions to make more clear how deleting stuff under bridges works; also remove an unnecessary local variable 2006-03-16 06:06:05 +00:00