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

Merge branch 'save_ext' into jgrpp

Browse Source 
# Conflicts:
#	config.lib
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2016-09-07 22:02:57 +01:00
parent 315db4874a a3d0fc5817
commit 5e67582a64
39 changed files with 777 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/openttd_vs100.vcxproj
View File

@@ -592,6 +592,7 @@
<ClInclude Include="..\src\roadstop_base.h" />
<ClInclude Include="..\src\roadveh.h" />
<ClInclude Include="..\src\safeguards.h" />
<ClInclude Include="..\src\scope.h" />
<ClInclude Include="..\src\screenshot.h" />
<ClInclude Include="..\src\sdl.h" />
<ClInclude Include="..\src\sound\sdl_s.h" />

3
projects/openttd_vs100.vcxproj.filters
View File

@@ -1005,6 +1005,9 @@
<ClInclude Include="..\src\safeguards.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\scope.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\screenshot.h">
<Filter>Header Files</Filter>
</ClInclude>

1
projects/openttd_vs140.vcxproj
View File

@@ -609,6 +609,7 @@
<ClInclude Include="..\src\roadstop_base.h" />
<ClInclude Include="..\src\roadveh.h" />
<ClInclude Include="..\src\safeguards.h" />
<ClInclude Include="..\src\scope.h" />
<ClInclude Include="..\src\screenshot.h" />
<ClInclude Include="..\src\sdl.h" />
<ClInclude Include="..\src\sound\sdl_s.h" />

3
projects/openttd_vs140.vcxproj.filters
View File

@@ -1005,6 +1005,9 @@
<ClInclude Include="..\src\safeguards.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\scope.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\screenshot.h">
<Filter>Header Files</Filter>
</ClInclude>

4
projects/openttd_vs80.vcproj
View File

@@ -1642,6 +1642,10 @@
RelativePath=".\..\src\safeguards.h"
>
</File>
<File
RelativePath=".\..\src\scope.h"
>
</File>
<File
RelativePath=".\..\src\screenshot.h"
>

4
projects/openttd_vs90.vcproj
View File

@@ -1639,6 +1639,10 @@
RelativePath=".\..\src\safeguards.h"
>
</File>
<File
RelativePath=".\..\src\scope.h"
>
</File>
<File
RelativePath=".\..\src\screenshot.h"
>