Commit Graph

826 Commits

Author SHA1 Message Date
HackaLittleBit
60345d2e18 Fix cost of building tunnels. 2017-06-07 19:56:20 +01:00
Jonathan G Rennison
4d21d6f81c Merge branch 'chunnel' into jgrpp 2017-04-04 23:30:04 +01:00
HackaLittleBit
eddd635f00 Chunnel: Make error reporting consistent with tunnel length reporting at cursor.
Error reporting should be in tune with occurrence of events.
2017-03-31 01:54:41 +01:00
Jonathan G Rennison
612c825bb6 Chunnel: Minor whitespace/scope changes, rename function. 2017-03-24 22:51:29 +00:00
HackaLittleBit
2549def764 Chunnel: Use separate container function for chunnel related conditions. 2017-03-24 22:40:38 +00:00
Jonathan G Rennison
0d4bf16f57 Merge branch 'custom_bridgeheads' into jgrpp 2017-03-23 20:15:45 +00:00
Jonathan G Rennison
57a5f08687 Fix handling of custom bridge heads on steep slopes. 2017-03-23 20:15:37 +00:00
HackaLittleBit
de24fed9d1 Chunnel: Tunnels are only allowed to cross sea. 2017-03-12 20:33:59 +00:00
Jonathan G Rennison
93a43da809 Chunnel: Prevent chunnels from intersecting with each other. 2017-03-05 19:13:42 +00:00
Jonathan G Rennison
4c9f7b73b3 Chunnel: Add a ground veh flag for (maybe) being in a chunnel
Use this to avoid inclination change code in non-chunnel wormholes.
2017-03-05 18:37:35 +00:00
Jonathan G Rennison
500ef49694 Chunnel: Double cost of building and removing chunnels. 2017-03-05 14:39:17 +00:00
Jonathan G Rennison
89a0a9c182 Chunnel: Use hash table for tunnel search, change tunnel fields and savegame format. 2017-03-05 14:39:10 +00:00
Jonathan G Rennison
212f6ce6ef Chunnel: Add setting to enable construction, default off. 2017-03-04 13:23:52 +00:00
Jonathan G Rennison
02b33e7f64 Chunnel: Add error text for too many tunnels. 2017-03-04 13:06:43 +00:00
Jonathan G Rennison
aac5b2d4ad Chunnel: Adjust struct Tunnel constructor 2017-03-04 12:36:01 +00:00
Jonathan G Rennison
21bbb42d7e Chunnel: Adjust arguments of IsTunnelInWay 2017-03-04 12:23:52 +00:00
HackaLittleBit
7e6215f271 Chunnel patch 28401: Add: Tile description chunnel.
https://www.tt-forums.net/viewtopic.php?p=1183580#p1183580
2017-03-04 11:59:36 +00:00
HackaLittleBit
15c8e67655 Chunnel patch 28400: Codechange: Chunnels can now pass normal tunnels, fixed tile highlighting, fixed ramp detection.
https://www.tt-forums.net/viewtopic.php?p=1183580#p1183580
2017-03-04 11:59:33 +00:00
HackaLittleBit
1ac8f66de1 Chunnel patch 28397: Codechange: Chunnels can't pass oilrigs.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
2017-03-04 11:50:52 +00:00
HackaLittleBit
dfce9cc4c0 Chunnel patch 28396: Codechange: Chunnel portal must have minimal length of 4 tiles.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
2017-03-04 11:48:12 +00:00
HackaLittleBit
dee526c6d6 Chunnel patch 28395: Add: Basic chunnel. Creating tunnels under water.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
2017-03-04 11:48:07 +00:00
HackaLittleBit
f7ced74c22 Chunnel patch 28394: Codechange: Rework IsTunnelInWay proc.
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
2017-03-04 11:48:00 +00:00
HackaLittleBit
ad070b91ea Chunnel patch 28392: Add: Basic tunnel pool. (no save)
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
2017-03-04 11:43:53 +00:00
Jonathan G Rennison
091c30e254 Merge branch 'custom_bridgeheads' into jgrpp 2017-02-22 02:54:01 +00:00
Jonathan G Rennison
c6fa52f1f1 Fix wrong calculation of road tunnel infrastructure counts. 2017-02-22 02:53:37 +00:00
Jonathan G Rennison
4550ac39b9 Merge branch 'signal_tunnels_bridges' into jgrpp 2017-02-12 12:17:51 +00:00
Jonathan G Rennison
e1ee952b85 Fix crash when updating infrastructure totals when deleting bridge with signals. 2017-02-12 12:17:43 +00: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
Jonathan G Rennison
1e5c788541 Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	src/table/settings.ini
#	src/tunnelbridge.h
2017-01-30 21:41:20 +00:00
Jonathan G Rennison
d762835903 Signals on tunnel/bridges are now added to infrastructure stats. 2017-01-30 21:37:17 +00:00
Jonathan G Rennison
074555e41d Merge branch 'save_ext' into signal_tunnels_bridges 2016-12-28 15:06:08 +00:00
Jonathan G Rennison
478ff2538e Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/lang/korean.txt
2016-12-09 23:42:54 +00:00
frosch
10293c5fb1 (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 2016-12-09 21:27:22 +00:00
frosch
4753097c3d (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 2016-12-09 21:27:22 +00:00
Jonathan G Rennison
10ae23d3b9 Merge branch 'departure-boards' into jgrpp
VehicleListIdentifier API changes.

# Conflicts:
#	src/departures.cpp
#	src/vehicle_gui.cpp
2016-11-11 18:46:15 +00:00
frosch
d9bfe88261 (svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary. 2016-11-05 11:53:03 +00:00
frosch
616c02c42e (svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary. 2016-11-05 11:53:03 +00:00
Jonathan G Rennison
f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
2016-09-18 20:07:48 +01:00
Jonathan G Rennison
556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals.
This is instead of the previous limit of 16, all stored in M2.
2016-09-18 20:06:59 +01:00
Jonathan G Rennison
0d2e9f91bf Adjust signal on bridge/tunnel map bits, rename accessors, add docs.
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
2016-09-18 20:06:39 +01:00
Jonathan G Rennison
d733955d33 Add road vehicle state to UpdateViewport()->GetImage() var whitelist.
Minor refactoring of var check.
2016-09-10 01:03:48 +01:00
keldorkatarn
4c37aad393 Make sure we the custom track type based signals for bridges and tunnels also.
(cherry picked from commit 1dc478cb654f88eab3c760bdc9f305ce3f039ec3)
2016-04-08 20:38:31 +01: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
Jonathan G Rennison
d08b162119 Merge branch 'signal_tunnels_bridges-sx' into jgrpp
# Conflicts:
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
2016-02-21 12:16:11 +00:00
Jonathan G Rennison
35b93a42ac Enable bridge/tunnel exit signals to be one-way PBS.
Add signal conversion support.
2016-02-20 23:49:06 +00:00
Jonathan G Rennison
1a2b5e5172 Also draw signals for tunnel exits. 2016-02-20 23:45:07 +00:00
Jonathan G Rennison
3861968765 Enable setting semaphore/electric type of signals on bridges/tunnels. 2016-02-20 23:44:21 +00:00
Jonathan G Rennison
2b4dbf582a Show tunnel/bridge exit signal facing correct way with correct colour. 2016-02-20 23:38:33 +00:00
Jonathan G Rennison
a25ac7a161 Enable signals on bridges/tunnels to work with PBS. 2016-02-20 23:34:06 +00:00