Jonathan G Rennison
16f2ef227b
Store tunnel/bridge signal spacing on tile, adjust spacing to fit length
2021-08-29 02:11:58 +01:00
Jonathan G Rennison
b2ef6c0de8
Add implementation of multi-aspect signalling and GRF support
...
Requires realistic braking
See: #247
2021-08-28 12:54:18 +01:00
Jonathan G Rennison
a0f78a8071
Fix assertion failure when upgrading dual road/tram bridge
...
In case where the other road/tram type does not extend across
the bridge, but is present on the upgrade tile.
2020-09-15 23:26:15 +01:00
Jonathan G Rennison
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
Jonathan G Rennison
d3e0c3787f
Merge branch 'master' into jgrpp-nrt
...
Merge trunk multiple docks implementation
# Conflicts:
# docs/landscape_grid.html
# src/order_cmd.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_order.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
2019-07-13 20:34:52 +01:00
Jonathan G Rennison
ba8ed880c1
Merge branch 'master' into jgrpp-nrt
...
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
2019-07-11 19:45:56 +01:00
Jonathan G Rennison
36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
2019-07-08 16:19:07 +01:00
peter1138
f538179878
Feature: Multi-tile docks and docking points.
2019-06-30 16:46:32 +02:00
peter1138
08f00151f1
Codechange: MakeBridgeRamp()'s road-or-rail-type parameter does not make sense.
...
Road type and rail type are stored in separate locations, so this parameter does
not make make sense as it is only used for rail bridges. Instead explicitly set the
rail type in MakeRailBridgeRamp().
2019-05-01 21:36:27 +02:00
peter1138
c02ef3e456
Feature: Add NotRoadTypes (NRT)
2019-05-01 21:36:27 +02:00
Jonathan G Rennison
31cf04cdf2
Save secondary track type when upgrading bridges
2019-02-18 02:58:27 +00:00
Jonathan G Rennison
ae15c96c1a
Merge branch 'master' into jgrpp
...
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_gui.cpp
# src/bridge_map.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/rail_map.h
# src/rail_type.h
# src/road_map.h
# src/saveload/afterload.cpp
# src/saveload/map_sl.cpp
# src/saveload/saveload.cpp
# src/script/api/script_rail.cpp
# src/station_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
2018-07-26 20:54:13 +01:00
Jonathan G Rennison
9e1e074c2b
Update existing assertions to log tile information where suitable
2018-07-26 19:13:35 +01:00
Peter Nelson
5db883fbe9
Change: Move rail type bits from m3 to m8.
2018-07-26 13:27:40 +01:00
Jonathan G Rennison
6740a9a470
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape.html
# src/bridge_map.h
# src/pbs.cpp
# src/saveload/company_sl.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_type.h
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
# src/vehicle.cpp
# src/viewport.cpp
2018-07-08 23:04:30 +01:00
Jonathan G Rennison
77362b829a
Initial support for rail custom bridge heads
2018-07-08 23:03:42 +01:00
Jonathan G Rennison
c053549144
Merge branch 'signal_tunnels_bridges' into jgrpp
2018-04-25 22:33:10 +01:00
Jonathan G Rennison
c92a28a072
Preserve signal simulation/reservation data when upgrading bridges.
...
Based on commit 301925f948c9b36966c9c668e1476c2485425338
2018-04-25 22:32:50 +01:00
Jonathan G Rennison
714b9711e4
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# src/tunnelbridge_cmd.cpp
2018-04-25 21:59:22 +01:00
Jonathan G Rennison
ff6a3ed234
Preserve custom bridge head road data when upgrading bridges.
...
Based on commit 301925f948c9b36966c9c668e1476c2485425338
2018-04-25 18:51:15 +01:00
Jonathan G Rennison
072915f2c7
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/settings_gui.cpp
# src/settings_type.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
2017-02-05 20:43:56 +00:00
Jonathan G Rennison
da177d063f
Custom bridge heads: Initial implementation
2017-02-05 20:43:19 +00:00
keldorkatarn
5cc56d6ad9
Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array.
...
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)
Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
2016-04-08 20:38:31 +01: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
9daf7e749c
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
2014-09-21 11:24:51 +00:00
rubidium
f3b79480ed
(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable
2014-09-21 11:23:33 +00:00
rubidium
982f5a6aa2
(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable
2014-09-21 11:23:33 +00:00
rubidium
173a234951
(svn r26876) -Codechange: move 'has bride above' data from m6 to type
2014-09-21 11:20:11 +00:00
rubidium
0ac2d3b324
(svn r26876) -Codechange: move 'has bride above' data from m6 to type
2014-09-21 11:20:11 +00:00
frosch
5bf6513dfc
(svn r24912) -Fix [FS#5389]: Upgrading bridges could steal road types. (adf88)
2013-01-13 13:17:12 +00:00
frosch
eda4cfeabe
(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
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
2013-01-08 22:46:42 +00:00
rubidium
70faeeaba9
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
2011-11-04 11:30:37 +00:00
rubidium
19eabdba2c
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
2011-11-04 11:30:37 +00:00
rubidium
5bc8a72377
(svn r23092) -Codechange: create a non-pixel version of some of the Get*PixelZ functions, and let Get*PixelZ wrap around the new function (multiplying the Z by TILE_HEIGHT) just like TileHeight and TilePixelHeight
2011-11-04 10:20:24 +00:00
rubidium
a36551dbb4
(svn r23092) -Codechange: create a non-pixel version of some of the Get*PixelZ functions, and let Get*PixelZ wrap around the new function (multiplying the Z by TILE_HEIGHT) just like TileHeight and TilePixelHeight
2011-11-04 10:20:24 +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
rubidium
7757a2ed40
(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
rubidium
f0ad5fd749
(svn r21844) -Codechange: move documentation towards the code to make it more likely to be updates [a-c].
2011-01-18 22:17:15 +00:00
rubidium
6c9078fd30
(svn r21844) -Codechange: move documentation towards the code to make it more likely to be updates [a-c].
2011-01-18 22:17:15 +00:00
alberth
9f3845227e
(svn r21273) -Codechange: Return values should start at the same line.
2010-11-20 15:44:24 +00:00
alberth
ab50f74d7f
(svn r21273) -Codechange: Return values should start at the same line.
2010-11-20 15:44:24 +00:00
rubidium
1f2276b785
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
2010-08-08 10:59:30 +00:00
rubidium
3da3d131c6
(svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable.
2010-08-08 10:59:30 +00:00
rubidium
9467b7c6d6
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
2010-01-15 16:41:15 +00:00
rubidium
82fc28f77f
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
2010-01-15 16:41:15 +00:00
rubidium
224f4e0197
(svn r18028) -Codechange: unglobalise some functions
2009-11-09 10:40:33 +00:00
rubidium
860b9b1cea
(svn r18028) -Codechange: unglobalise some functions
2009-11-09 10:40:33 +00:00
