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

3
projects/openttd_vs100.vcxproj
View File

@@ -693,6 +693,7 @@
<ClInclude Include="..\src\core\backup_type.hpp" />
<ClCompile Include="..\src\core\bitmath_func.cpp" />
<ClInclude Include="..\src\core\bitmath_func.hpp" />
<ClInclude Include="..\src\core\container_func.hpp" />
<ClInclude Include="..\src\core\endian_func.hpp" />
<ClInclude Include="..\src\core\endian_type.hpp" />
<ClInclude Include="..\src\core\enum_type.hpp" />
@@ -909,6 +910,7 @@
<ClCompile Include="..\src\saveload\extended_ver_sl.cpp" />
<ClCompile Include="..\src\saveload\tbtr_template_replacement_sl.cpp" />
<ClCompile Include="..\src\saveload\tbtr_template_veh_sl.cpp" />
<ClCompile Include="..\src\saveload\bridge_signal_sl.cpp" />
<ClInclude Include="..\src\table\airport_defaults.h" />
<ClInclude Include="..\src\table\airport_movement.h" />
<ClInclude Include="..\src\table\airporttile_ids.h" />
@@ -1217,6 +1219,7 @@
<ClCompile Include="..\src\newgrf_townname.cpp" />
<ClCompile Include="..\src\bridge_map.cpp" />
<ClInclude Include="..\src\bridge_map.h" />
<ClInclude Include="..\src\bridge_signal_map.h" />
<ClInclude Include="..\src\clear_map.h" />
<ClInclude Include="..\src\industry_map.h" />
<ClInclude Include="..\src\object_map.h" />

9
projects/openttd_vs100.vcxproj.filters
View File

@@ -1308,6 +1308,9 @@
<ClInclude Include="..\src\core\bitmath_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>
<ClInclude Include="..\src\core\container_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>
<ClInclude Include="..\src\core\endian_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>
@@ -1956,6 +1959,9 @@
<ClCompile Include="..\src\saveload\tbtr_template_veh_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\bridge_signal_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClInclude Include="..\src\table\airport_defaults.h">
<Filter>Tables</Filter>
</ClInclude>
@@ -2880,6 +2886,9 @@
<ClInclude Include="..\src\bridge_map.h">
<Filter>Map Accessors</Filter>
</ClInclude>
<ClInclude Include="..\src\bridge_signal_map.h">
<Filter>Map Accessors</Filter>
</ClInclude>
<ClInclude Include="..\src\clear_map.h">
<Filter>Map Accessors</Filter>
</ClInclude>

3
projects/openttd_vs140.vcxproj
View File

@@ -710,6 +710,7 @@
<ClInclude Include="..\src\core\backup_type.hpp" />
<ClCompile Include="..\src\core\bitmath_func.cpp" />
<ClInclude Include="..\src\core\bitmath_func.hpp" />
<ClInclude Include="..\src\core\container_func.hpp" />
<ClInclude Include="..\src\core\endian_func.hpp" />
<ClInclude Include="..\src\core\endian_type.hpp" />
<ClInclude Include="..\src\core\enum_type.hpp" />
@@ -926,6 +927,7 @@
<ClCompile Include="..\src\saveload\extended_ver_sl.cpp" />
<ClCompile Include="..\src\saveload\tbtr_template_replacement_sl.cpp" />
<ClCompile Include="..\src\saveload\tbtr_template_veh_sl.cpp" />
<ClCompile Include="..\src\saveload\bridge_signal_sl.cpp" />
<ClInclude Include="..\src\table\airport_defaults.h" />
<ClInclude Include="..\src\table\airport_movement.h" />
<ClInclude Include="..\src\table\airporttile_ids.h" />
@@ -1234,6 +1236,7 @@
<ClCompile Include="..\src\newgrf_townname.cpp" />
<ClCompile Include="..\src\bridge_map.cpp" />
<ClInclude Include="..\src\bridge_map.h" />
<ClInclude Include="..\src\bridge_signal_map.h" />
<ClInclude Include="..\src\clear_map.h" />
<ClInclude Include="..\src\industry_map.h" />
<ClInclude Include="..\src\object_map.h" />

9
projects/openttd_vs140.vcxproj.filters
View File

@@ -1308,6 +1308,9 @@
<ClInclude Include="..\src\core\bitmath_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>
<ClInclude Include="..\src\core\container_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>
<ClInclude Include="..\src\core\endian_func.hpp">
<Filter>Core Source Code</Filter>
</ClInclude>
@@ -1956,6 +1959,9 @@
<ClCompile Include="..\src\saveload\tbtr_template_veh_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\bridge_signal_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClInclude Include="..\src\table\airport_defaults.h">
<Filter>Tables</Filter>
</ClInclude>
@@ -2880,6 +2886,9 @@
<ClInclude Include="..\src\bridge_map.h">
<Filter>Map Accessors</Filter>
</ClInclude>
<ClInclude Include="..\src\bridge_signal_map.h">
<Filter>Map Accessors</Filter>
</ClInclude>
<ClInclude Include="..\src\clear_map.h">
<Filter>Map Accessors</Filter>
</ClInclude>

12
projects/openttd_vs80.vcproj
View File

@@ -2050,6 +2050,10 @@
RelativePath=".\..\src\core\bitmath_func.hpp"
>
</File>
<File
RelativePath=".\..\src\core\container_func.hpp"
>
</File>
<File
RelativePath=".\..\src\core\endian_func.hpp"
>
@@ -2930,6 +2934,10 @@
RelativePath=".\..\src\saveload\tbtr_template_veh_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\bridge_signal_sl.cpp"
>
</File>
</Filter>
<Filter
Name="Tables"
@@ -4226,6 +4234,10 @@
RelativePath=".\..\src\bridge_map.h"
>
</File>
<File
RelativePath=".\..\src\bridge_signal_map.h"
>
</File>
<File
RelativePath=".\..\src\clear_map.h"
>

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"
>