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:
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2018-05-29 12:23:56 +01:00
parent 641e877441 aae7806d5d
commit 159909f4b1
14 changed files with 481 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/openttd_vs100.vcxproj
View File

@@ -932,6 +932,7 @@
<ClInclude Include="..\src\saveload\saveload.h" />
<ClInclude Include="..\src\saveload\saveload_filter.h" />
<ClInclude Include="..\src\saveload\saveload_internal.h" />
<ClInclude Include="..\src\saveload\saveload_buffer.h" />
<ClCompile Include="..\src\saveload\signs_sl.cpp" />
<ClCompile Include="..\src\saveload\station_sl.cpp" />
<ClCompile Include="..\src\saveload\storage_sl.cpp" />

3
projects/openttd_vs100.vcxproj.filters
View File

@@ -1956,6 +1956,9 @@
<ClInclude Include="..\src\saveload\saveload_internal.h">
<Filter>Save/Load handlers</Filter>
</ClInclude>
<ClInclude Include="..\src\saveload\saveload_buffer.h">
<Filter>Save/Load handlers</Filter>
</ClInclude>
<ClCompile Include="..\src\saveload\signs_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>

1
projects/openttd_vs140.vcxproj
View File

@@ -953,6 +953,7 @@
<ClInclude Include="..\src\saveload\saveload.h" />
<ClInclude Include="..\src\saveload\saveload_filter.h" />
<ClInclude Include="..\src\saveload\saveload_internal.h" />
<ClInclude Include="..\src\saveload\saveload_buffer.h" />
<ClCompile Include="..\src\saveload\signs_sl.cpp" />
<ClCompile Include="..\src\saveload\station_sl.cpp" />
<ClCompile Include="..\src\saveload\storage_sl.cpp" />

3
projects/openttd_vs140.vcxproj.filters
View File

@@ -1956,6 +1956,9 @@
<ClInclude Include="..\src\saveload\saveload_internal.h">
<Filter>Save/Load handlers</Filter>
</ClInclude>
<ClInclude Include="..\src\saveload\saveload_buffer.h">
<Filter>Save/Load handlers</Filter>
</ClInclude>
<ClCompile Include="..\src\saveload\signs_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>

1
projects/openttd_vs141.vcxproj
View File

@@ -953,6 +953,7 @@
<ClInclude Include="..\src\saveload\saveload.h" />
<ClInclude Include="..\src\saveload\saveload_filter.h" />
<ClInclude Include="..\src\saveload\saveload_internal.h" />
<ClInclude Include="..\src\saveload\saveload_buffer.h" />
<ClCompile Include="..\src\saveload\signs_sl.cpp" />
<ClCompile Include="..\src\saveload\station_sl.cpp" />
<ClCompile Include="..\src\saveload\storage_sl.cpp" />

3
projects/openttd_vs141.vcxproj.filters
View File

@@ -1956,6 +1956,9 @@
<ClInclude Include="..\src\saveload\saveload_internal.h">
<Filter>Save/Load handlers</Filter>
</ClInclude>
<ClInclude Include="..\src\saveload\saveload_buffer.h">
<Filter>Save/Load handlers</Filter>
</ClInclude>
<ClCompile Include="..\src\saveload\signs_sl.cpp">
<Filter>Save/Load handlers</Filter>
</ClCompile>

4
projects/openttd_vs80.vcproj
View File

@@ -2934,6 +2934,10 @@
RelativePath=".\..\src\saveload\saveload_internal.h"
>
</File>
<File
RelativePath=".\..\src\saveload\saveload_buffer.h"
>
</File>
<File
RelativePath=".\..\src\saveload\signs_sl.cpp"
>

4
projects/openttd_vs90.vcproj
View File

@@ -2931,6 +2931,10 @@
RelativePath=".\..\src\saveload\saveload_internal.h"
>
</File>
<File
RelativePath=".\..\src\saveload\saveload_buffer.h"
>
</File>
<File
RelativePath=".\..\src\saveload\signs_sl.cpp"
>