Commit Graph

163 Commits

Author SHA1 Message Date
tron
2b27073156 (svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular 2006-06-27 21:25:53 +00:00
tron
9b6fce70a2 (svn r5317) s/RGT_/ROADSIDE_/ and some minor changes 2006-06-19 20:13:50 +00:00
tron
431baba8fe (svn r5315) -Fix: Prohibit altering a road tile while road works are in progress
This fixes some glitches like "turning" the excavation by adding/removing road bits or removing the road piece
2006-06-19 17:22:57 +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
be88e269b9 (svn r5155) - Remove the bridge branch merge (revision r5070) 2006-06-07 19:35:21 +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
3282efda88 (svn r4940) Remove the dubious feature of remembering the last built depot. It serves no real purpose except causing confusion 2006-05-21 13:51:36 +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
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
Darkvater
8070a68b2c (svn r4590) - Fix (r4585): warning: suggest parentheses around && within ||. Sorry 2006-04-27 08:24:48 +00:00
Darkvater
feefbbbf06 (svn r4586) - Codechange: Recursive commands that rely on _error_message to handle success/failure can fail if a recursive call fails but doesn't set the error message, thus resulting in an old, possibly erroneous being used (see FS#130 prior to r4585). Now properly reset the global variable _error_message in these cases. 2006-04-26 21:48:22 +00:00
Darkvater
939dd7d2bf (svn r4585) - Fix [FS#130] - Obscure road dragging bug. The road build command did not return the appropiate error message of invalid-slope when building road. 2006-04-26 21:44:22 +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
4ad0c3cd75 (svn r4544) Merge two almost identical string (STR_1[08]00_LAND_SLOPED_IN_WRONG_DIRECTION) - one just contains two redundant words 2006-04-23 15:01:46 +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
d63fad7a7b (svn r4435) - Fix: an assertion triggered when trying to remove a bridge with the remove-tool (r4348 surfaced this). In CmdRemoveRoad tiletype was not checked for ownership. Intorudce IsLevelCrossingTile() which checks if a tile is a crossing without knowing the type. Suggested by peter1138 and Tron. 2006-04-15 20:07:42 +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
857ccb97c9 (svn r4263) -Codechange: Road building no longer uses FindLandscapeHeight. Last occurence of FindLandscapeTile in the tile-specific functions gone. Thanks to Tron for doing lots of work in this direction 2006-04-03 15:18:12 +00:00
celestar
961b44e697 (svn r4258) -Codechange: Add and make use of map accessors dealing with road ground types (including roadworks). 2006-04-03 13:35:19 +00:00
celestar
3aa1e38be6 (svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE 2006-04-03 05:32:11 +00:00
tron
892a4c587d (svn r4242) Pass TileIndex and slope to GetSlopeTileh_*() instead of TileInfo 2006-04-02 12:49:18 +00:00
tron
f2087afbba (svn r4230) The road is asked for, not the rail. Undo part of r4164. (Pointed out by peter1138) 2006-04-02 07:05:35 +00:00
tron
7fbd940c82 (svn r4187) Simplify the code for building/removing a piece of road a bit 2006-03-31 06:16:04 +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
85d4d3a414 (svn r4160) CodeChange : Revert part of 4157, spotted by Tron 2006-03-29 21:10:42 +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
9ad72f2d47 (svn r4111) Fix/Remove some stale comments 2006-03-26 11:08:44 +00:00
celestar
842eac5d7f (svn r4088) -Codechange: Introduce {Unb,B}arCrossing and IsCrossingBarred to put and get the status of a level crossing 2006-03-24 15:24:16 +00:00
tron
88d27219b4 (svn r4085) Add GetTown{Index,ByTile}() to get the town index resp. the town from a tile 2006-03-24 12:00:24 +00:00
tron
5701e1a237 (svn r4000) Rewrite GetSlope{Tileh,Z}_{Road,Track} in a less confusing way 2006-03-21 22:06:32 +00:00
tron
eb85fcb57b (svn r3990) Remove another call to FindLandscapeHeight() 2006-03-20 13:34:01 +00:00
tron
75a9419f04 (svn r3986) Add [GS]etCrossingRoadOwner 2006-03-19 19:33:19 +00:00
tron
a751a796e1 (svn r3984) Add a function to get the road axis of a level crossing 2006-03-19 17:15:33 +00:00
tron
4b74fa1923 (svn r3981) More work for the rail accessing functions and enums 2006-03-19 13:48:08 +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
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
e8ccd9641f (svn r3846) Add functions to set the type of stuff (clear, water, rail, road) under bridges 2006-03-13 12:55:20 +00:00
tron
abca252ff5 (svn r3812) Remove a pointless goto 2006-03-10 11:27:52 +00:00
tron
463cf2ec6b (svn r3795) Add a function to request the orientation of a depot 2006-03-08 15:29:23 +00:00
tron
f3fb21c96c (svn r3773) Shove some semantics down ottd's throat by replacing ints and magic numbers by enums and some related changes 2006-03-06 13:11:08 +00:00
tron
d793292778 (svn r3770) Remove the _road_special_gettrackstatus hack. Egladil and me deem it unnecessary 2006-03-05 17:24:04 +00:00
tron
f007ad282c (svn r3766) Add a function to get the RoadBits from an arbitrary tile 2006-03-05 12:22:20 +00:00