dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'signal_tunnels_bridges' into jgrpp

Browse Source 
# 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
This commit is contained in:
Jonathan G Rennison
2016-09-18 20:07:48 +01:00
parent 201294c16e 556594f2f0
commit f82feb160f
26 changed files with 467 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source.list
View File

@@ -675,6 +675,7 @@ saveload/extended_ver_sl.h
saveload/extended_ver_sl.cpp
saveload/tbtr_template_replacement_sl.cpp
saveload/tbtr_template_veh_sl.cpp
saveload/bridge_signal_sl.cpp
# Tables
table/airport_defaults.h
@@ -1022,6 +1023,7 @@ newgrf_townname.cpp
# Map Accessors
bridge_map.cpp
bridge_map.h
bridge_signal_map.h
clear_map.h
industry_map.h
object_map.h