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

12
projects/openttd_vs90.vcproj
View File

@@ -2047,6 +2047,10 @@
RelativePath=".\..\src\core\bitmath_func.hpp"
>
</File>
<File
RelativePath=".\..\src\core\container_func.hpp"
>
</File>
<File
RelativePath=".\..\src\core\endian_func.hpp"
>
@@ -2927,6 +2931,10 @@
RelativePath=".\..\src\saveload\tbtr_template_veh_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\bridge_signal_sl.cpp"
>
</File>
</Filter>
<Filter
Name="Tables"
@@ -4223,6 +4231,10 @@
RelativePath=".\..\src\bridge_map.h"
>
</File>
<File
RelativePath=".\..\src\bridge_signal_map.h"
>
</File>
<File
RelativePath=".\..\src\clear_map.h"
>