Commit Graph

257 Commits

Author SHA1 Message Date
tron
2bb9fd3901 (svn r5624) Use {IsPlainRailTile,IsRailDepot,IsRailWaypoint,HasSignals}() instead of GetRailTile{T,Subt}ype() - this is more concise and a bit more flexible if/when the rail tile encoding changes 2006-07-27 05:30:53 +00:00
tron
6c6494588e (svn r5618) Remove a redundant check, CheckTrackCombination() a few lines above performs the same test 2006-07-26 12:11:52 +00:00
tron
7ec704564a (svn r5582) Add and use AxisToTrack{Bits,}() 2006-07-22 08:59:52 +00:00
tron
43b9204d42 (svn r5500) Undo r4597, because it breaks the intended change of r5315 to prohibit building rails on a road tile while road works are in progress 2006-07-15 09:29:39 +00:00
truelight
26e1e8ce61 (svn r5497) -Fix: somehow in r5315 slipped some wrong logic, allowed you to build rail on all road pieces without really building it ;) 2006-07-14 18:14:08 +00:00
tron
2b7089c637 (svn r5396) - Remove two fixed parameters
- Simplify an expresssion: c ? f(x) : f(y) -> f(c ? x : y)
2006-06-28 06:10:20 +00:00
tron
2b27073156 (svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular 2006-06-27 21:25:53 +00:00
tron
f6b15f9fc4 (svn r5363) Revert 5312, 5288, 5248, 3992, 3249, 3228
They were all aimed at fixing the terraform-into-tunnel problem, but introduced new sideeffects while doing so
2006-06-25 17:39:19 +00:00
tron
9e28713c4c (svn r5326) Remove the indicator bit for custom waypoint graphics, because it just contains redundant information
Yup-yup-ed by: peter1138
2006-06-21 11:30:28 +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
60e65953fc (svn r5308) Replace an array of function pointers with a switch: It's shorter, more comprehensible, less dependent on magic numbers 2006-06-18 09:37:08 +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
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
glx
62dbc36741 (svn r4906) - Fix: Refresh build vehicle window (if opened) when converting rail depot 2006-05-18 16:51:42 +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
peter1138
9208cd3f42 (svn r4770) - Revert unindented change to rail_cmd.c in r4769. 2006-05-07 11:49:48 +00:00
peter1138
d3fea69041 (svn r4769) - Newstations: add newstations ttdpatch flag 2006-05-07 11:41:44 +00:00
peter1138
31a54a6835 (svn r4767) - Newstations: fix loading / use of custom ground sprites 2006-05-07 10:58:53 +00:00
peter1138
f689b20874 (svn r4754) - Newstations: expose default station display data via a function so we can use it (rarely) in other places. 2006-05-06 20:33:22 +00:00
peter1138
b7e0ca4453 (svn r4748) - Newstations: use custom sprite layout callback for waypoints as well as stations. Supports merging of adjacent waypoints if the GRF supports it (newstatsw.grf) 2006-05-06 09:40:12 +00:00
peter1138
4963eb80b7 (svn r4739) - Newstations: remove cargo type parameter of GetCustomStationRelocation() as we can determine it internally 2006-05-04 19:21:16 +00:00
peter1138
be5744ae50 (svn r4723) - Newstations: add TileIndex parameter to station resolver. 2006-05-03 21:19:21 +00:00
peter1138
76411cef63 (svn r4719) - Newstations: instead of drawing nothing, fall back to the default sprite layout if a station layout specifies so. 2006-05-03 20:35:41 +00:00
belugas
187013b6a3 (svn r4593) CodeChange : Renamed spec (when using StationSpec) to statspec.
This is following the same scheme as for IndustrySpec
2006-04-27 18:28:56 +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
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
peter1138
14b6860e62 (svn r4546) - NewGRF: add support for Action 0x05, type 0x04: replacement signal graphics. Thanks to Purno for supplying data to test
with.
2006-04-23 15:57:34 +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
celestar
6935fb6455 (svn r4461) -Codechange: Add and make use of map accessor functions for signal drawing. Includes some basic cleanup of the drawing functions 2006-04-17 19:09:30 +00:00
Darkvater
7456c6e6ed (svn r4440) - Fix: Yoyo-effect of rail in desert/snow introduced by r4379. When a special groundtype below the track is encountered in the tileloop, always return even if groundtype hasn't changed. 2006-04-15 22:16:47 +00:00
peter1138
4118b66322 (svn r4415) Fix bug introduced in r4384 where drawing a default waypoint for the GUI
caused a game crash. This only manifested with some newstations loaded. 
Thanks to Richk67 for finding this.
2006-04-14 16:28:24 +00:00
celestar
b03bd97b47 (svn r4386) -Codechange: Add and make use of IsCustomWaypoint 2006-04-12 13:25:32 +00:00
celestar
bdcb4bbf1d (svn r4384) -Codechange: rail drawing code
-Added a function to obtain the axis of a waypoint
    -Moved the waypoint layout tables from the depot layout tables into an own one
    -Use GetRailTileSubtype
2006-04-12 12:50:40 +00:00
peter1138
f733f94677 (svn r4383) - Codechange: Remove extraneous code from 4354; no need to get RailTypeInfo when we already have it... 2006-04-12 12:33:21 +00:00
celestar
5b33383f65 (svn r4382) -Codechange: Make use of SetSignalType where appropriate 2006-04-12 12:24:39 +00:00
celestar
0b16a2d41b (svn r4381) -Codechange: Forgot an occurence for rail ground types 2006-04-12 12:22:43 +00:00
celestar
c08ed855f3 (svn r4380) -Codechange: Make use of GetTrackBits where appropriate 2006-04-12 12:12:51 +00:00
celestar
ee7eaef29d (svn r4379) -Codechange: Add and make use of map accessor functions concerning rail ground types 2006-04-12 11:58:07 +00:00
celestar
923a0e60d6 (svn r4378) -Add and make use of an accessor function two-way => one-way => one-way => two-way signal cycling 2006-04-12 09:36:27 +00:00
celestar
5ae9a03a1f (svn r4377) -Add and make use of a function that finds out whether a signal is an entry or and exit signal to a presignal block (as combos act as both) 2006-04-12 09:12:33 +00:00
celestar
e79c36bf8c (svn r4376) -Codechange Renamed GetSignalState to GetSignalStateByTrackdir 2006-04-12 08:28:03 +00:00
celestar
a8d4285ec2 (svn r4375) -Codechange: Move the signal drawing bit to an own function and rename DrawSignalHelper to DrawSingleSignal 2006-04-12 08:06:08 +00:00