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

Merge branch 'chunnel' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-03-19 12:30:26 +00:00
parent b3fd11efd2 4af4cbc2a4
commit 33cd1569f4
6 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/openttd_vs100.vcxproj
View File

@@ -676,6 +676,7 @@
<ClInclude Include="..\src\transparency_gui.h" />
<ClInclude Include="..\src\transport_type.h" />
<ClInclude Include="..\src\tunnelbridge.h" />
<ClInclude Include="..\src\tunnel_base.h" />
<ClInclude Include="..\src\vehicle_base.h" />
<ClInclude Include="..\src\vehicle_func.h" />
<ClInclude Include="..\src\vehicle_gui.h" />
@@ -917,6 +918,7 @@
<ClCompile Include="..\src\saveload\story_sl.cpp" />
<ClCompile Include="..\src\saveload\subsidy_sl.cpp" />
<ClCompile Include="..\src\saveload\town_sl.cpp" />
<ClCompile Include="..\src\saveload\tunnel_sl.cpp" />
<ClCompile Include="..\src\saveload\vehicle_sl.cpp" />
<ClCompile Include="..\src\saveload\waypoint_sl.cpp" />
<ClCompile Include="..\src\saveload\signal_sl.cpp" />

6
projects/openttd_vs100.vcxproj.filters
View File

@@ -1224,6 +1224,9 @@
<ClInclude Include="..\src\tunnelbridge.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\tunnel_base.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\vehicle_base.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1947,6 +1950,9 @@
<ClCompile Include="..\src\saveload\town_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\tunnel_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\vehicle_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>

2
projects/openttd_vs140.vcxproj
View File

@@ -693,6 +693,7 @@
<ClInclude Include="..\src\transparency_gui.h" />
<ClInclude Include="..\src\transport_type.h" />
<ClInclude Include="..\src\tunnelbridge.h" />
<ClInclude Include="..\src\tunnel_base.h" />
<ClInclude Include="..\src\vehicle_base.h" />
<ClInclude Include="..\src\vehicle_func.h" />
<ClInclude Include="..\src\vehicle_gui.h" />
@@ -934,6 +935,7 @@
<ClCompile Include="..\src\saveload\story_sl.cpp" />
<ClCompile Include="..\src\saveload\subsidy_sl.cpp" />
<ClCompile Include="..\src\saveload\town_sl.cpp" />
<ClCompile Include="..\src\saveload\tunnel_sl.cpp" />
<ClCompile Include="..\src\saveload\vehicle_sl.cpp" />
<ClCompile Include="..\src\saveload\waypoint_sl.cpp" />
<ClCompile Include="..\src\saveload\signal_sl.cpp" />

6
projects/openttd_vs140.vcxproj.filters
View File

@@ -1224,6 +1224,9 @@
<ClInclude Include="..\src\tunnelbridge.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\tunnel_base.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\vehicle_base.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -1947,6 +1950,9 @@
<ClCompile Include="..\src\saveload\town_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\tunnel_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\saveload\vehicle_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>

8
projects/openttd_vs80.vcproj
View File

@@ -1930,6 +1930,10 @@
RelativePath=".\..\src\tunnelbridge.h"
>
</File>
<File
RelativePath=".\..\src\tunnel_base.h"
>
</File>
<File
RelativePath=".\..\src\vehicle_base.h"
>
@@ -2914,6 +2918,10 @@
RelativePath=".\..\src\saveload\town_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\tunnel_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\vehicle_sl.cpp"
>

8
projects/openttd_vs90.vcproj
View File

@@ -1927,6 +1927,10 @@
RelativePath=".\..\src\tunnelbridge.h"
>
</File>
<File
RelativePath=".\..\src\tunnel_base.h"
>
</File>
<File
RelativePath=".\..\src\vehicle_base.h"
>
@@ -2911,6 +2915,10 @@
RelativePath=".\..\src\saveload\town_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\tunnel_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\vehicle_sl.cpp"
>