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

Merge branch 'save_ext' into enhanced_viewport_overlay-sx

Browse Source 
Conflicts:
	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-05 21:31:57 +01:00
parent e24839ed65 03b6c41c67
commit 174779e371
21 changed files with 981 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/openttd_vs100.vcxproj
View File

@@ -878,6 +878,8 @@
<ClCompile Include="..\src\saveload\town_sl.cpp" />
<ClCompile Include="..\src\saveload\vehicle_sl.cpp" />
<ClCompile Include="..\src\saveload\waypoint_sl.cpp" />
<ClInclude Include="..\src\saveload\extended_ver_sl.h" />
<ClCompile Include="..\src\saveload\extended_ver_sl.cpp" />
<ClInclude Include="..\src\table\airport_defaults.h" />
<ClInclude Include="..\src\table\airport_movement.h" />
<ClInclude Include="..\src\table\airporttile_ids.h" />

6
projects/openttd_vs100.vcxproj.filters
View File

@@ -1863,6 +1863,12 @@
<ClCompile Include="..\src\saveload\waypoint_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClInclude Include="..\src\saveload\extended_ver_sl.h">
<Filter>Save/Load handlers</Filter>
</ClInclude>
<ClCompile Include="..\src\saveload\extended_ver_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>
<ClInclude Include="..\src\table\airport_defaults.h">
<Filter>Tables</Filter>
</ClInclude>

8
projects/openttd_vs80.vcproj
View File

@@ -2806,6 +2806,14 @@
RelativePath=".\..\src\saveload\waypoint_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\extended_ver_sl.h"
>
</File>
<File
RelativePath=".\..\src\saveload\extended_ver_sl.cpp"
>
</File>
</Filter>
<Filter
Name="Tables"

8
projects/openttd_vs90.vcproj
View File

@@ -2803,6 +2803,14 @@
RelativePath=".\..\src\saveload\waypoint_sl.cpp"
>
</File>
<File
RelativePath=".\..\src\saveload\extended_ver_sl.h"
>
</File>
<File
RelativePath=".\..\src\saveload\extended_ver_sl.cpp"
>
</File>
</Filter>
<Filter
Name="Tables"