Commit Graph

41 Commits

Author SHA1 Message Date
celestar
8cd5daa533 (svn r7573) -Merged the bridge branch. Allows to build bridges of arbitrary rail/road combinations (including signals) 2006-12-27 12:38:02 +00:00
Darkvater
421d3653c7 (svn r7470) -Codechange: Leave elrails enabled after loading old (pre-optional) and very old (pre-elrails) games. Let the user manually disable if if undesired. 2006-12-10 15:21:48 +00:00
KUDr
ff7e46f378 (svn r7195) -Feature: [FS#297, optional elrails] New patches/vehicles option 'disable electrified railways'.
(original patch by maedhros, ideas: peter1138, Darkvater, Rubidium, Patrick, Eddi|zuHause, ..)
2006-11-17 19:31:44 +00:00
Darkvater
7e4d0f112e (svn r6406) -Codechange: Rename TileOffsByDir to TileOffsByDiagDir because it accepts
DiagDirections, and add TileOffsByDir that handles Directions.
-Codechange: Make the treeloop use TileOffsByDir().
2006-09-05 23:21:41 +00:00
rubidium
21ac20aeca (svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
-Cleanup: whitespace alignment of a few tables.
2006-09-04 20:40:33 +00:00
tron
1bb62bdef7 (svn r6265) Check whether to draw catenary at all once before the drawing loop instead of on every iteration 2006-08-31 11:18:30 +00:00
tron
f1a9bda2d5 (svn r6255) Simplify drawing of catenary in depots 2006-08-31 07:29:19 +00:00
glx
9247868696 (svn r6226) -Fix(r5864): an assertion was triggered when drawing catenary on steep slopes (TrueLight) 2006-08-29 21:34:02 +00:00
tron
3c368fc05e (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
belugas
40a8964911 (svn r5609) CodeChange : Apply coding style 2006-07-26 03:33:12 +00:00
tron
07de965e0c (svn r5584) When drawing catenary on a bridge calculate its height only once 2006-07-22 09:08:34 +00:00
tron
d7cc128c96 (svn r5582) Add and use AxisToTrack{Bits,}() 2006-07-22 08:59:52 +00:00
tron
772fbda3e3 (svn r5391) Miscellaneous, mostly bracing and whitespace, nothing spectacular 2006-06-27 21:25:53 +00:00
tron
e12ea73ec4 (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
a2362674e3 (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
e6b5a07962 (svn r5198) Fix some strange control flow: the case for MP_RAILWAY fell through the case for MP_TUNNELBRIDGE 2006-06-09 15:24:04 +00:00
tron
7fd88e5798 (svn r5155) - Remove the bridge branch merge (revision r5070) 2006-06-07 19:35:21 +00:00
tron
020721565a (svn r5136) Fix various style bugs:
- Trailing whitespace
- Trailing empty lines
- Missing newline at EOF
- Missing svn:eol-style native
2006-06-05 18:10:43 +00:00
celestar
b618b75c9b (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
celestar
14d347b426 (svn r4934) -Fix: Correct a misleading comment, and remove an unneeded condition from the corresponding if (thans Tron for pointing it out) 2006-05-20 21:04:43 +00:00
rubidium
2a337ab009 (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
3dae1a9bba (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
glx
8bb61ca472 (svn r4785) - Newstations: don't draw catenary on non-track tiles 2006-05-08 21:59:36 +00:00
tron
6dbc9c9ced (svn r4554) Replace magic numbers by TILE_{HEIGHT,SIZE} 2006-04-23 19:35:36 +00:00
tron
dd180a1e18 (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
a251b9373f (svn r4307) -Fix: Coding style in previous commit. Thanks to Tron for instant notice 2006-04-07 07:40:44 +00:00
celestar
f2cb8b8bd6 (svn r4306) -Fix (103). Assertion when removing elrails under bridges. Thanks to Rubidium for reporting and fixing 2006-04-07 07:39:03 +00:00
celestar
c7915be541 (svn r4305) -Codechange: Minor elrail cleanup (Tron) 2006-04-07 07:19:14 +00:00
celestar
f3e650a7d1 (svn r4284) -Fix: Tunnel portals no longer have a pylon ON them if there is a track right above the portal 2006-04-05 09:28:57 +00:00
celestar
0d0f2f6d98 (svn r4283) -Cleanup: More elrail housekeeping, remove code dublication, more meaningful variable names, simplify control flow.. 2006-04-05 09:17:43 +00:00
celestar
0a79bc8357 (svn r4281) -Cleanup: Begun cleaning up elrail code a bit, mostly comments and enum/array alignment 2006-04-05 08:28:03 +00:00
celestar
39460c5e0a (svn r4276) -Codechange: Cleaned DrawCatenaryOnBridge a bit (requested by Tron) 2006-04-04 12:31:29 +00:00
celestar
ca0c73e4ea (svn r4216) -Fix: Fixed revision 4214, did a bad error there. Thanks MiHaMiX for pointing it out 2006-03-31 19:14:17 +00:00
celestar
bb8bdcb5d9 (svn r4214) -Fix: Do not try to obtain Trackbits for normal rails, bus stops, airports and other non-rail tiles 2006-03-31 19:01:57 +00:00
orudge
ff3c61b011 (svn r4204) - Get trunk compiling again on OS/2 2006-03-31 16:01:59 +00:00
celestar
1f17d91b47 (svn r4180) -Fix: Fixed an assert in the elrail drawing code due to passing of a wrong variable. I wish the compiler would warn about different enum types used... 2006-03-30 15:47:18 +00:00
celestar
e2e633665e (svn r4178) -Fix: Draw catenary inside waypoints as well 2006-03-30 13:12:36 +00:00
celestar
79d594313e (svn r4177) -Fix: GetRailTrackBitsUniversal needs Trackbits, not Track. While at it, remove an unused variable 2006-03-30 13:06:16 +00:00
celestar
5476fd4b96 (svn r4165) -Do not use GetBridgeAxis on bridge ramps (request by Tron) 2006-03-30 09:26:17 +00:00
tron
410b5569fe (svn r4164) Use acessor functions 2006-03-30 09:08:43 +00:00
celestar
6c44bf5012 (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