Merge branch 'cpp-11' into save_ext

2019-01-13 23:30:52 +00:00
parent 0dba091d79 d86aa7719b
commit 4a162c5502
144 changed files with 1021 additions and 328 deletions
--- a/projects/openttd_vs140.vcxproj
+++ b/projects/openttd_vs140.vcxproj
@@ -521,6 +521,7 @@
    <ClInclude Include="..\src\group_gui.h" />
    <ClInclude Include="..\src\group_type.h" />
    <ClInclude Include="..\src\gui.h" />
+    <ClInclude Include="..\src\guitimer_func.h" />
    <ClInclude Include="..\src\heightmap.h" />
    <ClInclude Include="..\src\highscore.h" />
    <ClInclude Include="..\src\hotkeys.h" />
--- a/projects/openttd_vs140.vcxproj.filters
+++ b/projects/openttd_vs140.vcxproj.filters
@@ -651,6 +651,9 @@
    <ClInclude Include="..\src\gui.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\src\guitimer_func.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="..\src\heightmap.h">
      <Filter>Header Files</Filter>
    </ClInclude>
--- a/projects/openttd_vs141.vcxproj
+++ b/projects/openttd_vs141.vcxproj
@@ -521,6 +521,7 @@
    <ClInclude Include="..\src\group_gui.h" />
    <ClInclude Include="..\src\group_type.h" />
    <ClInclude Include="..\src\gui.h" />
+    <ClInclude Include="..\src\guitimer_func.h" />
    <ClInclude Include="..\src\heightmap.h" />
    <ClInclude Include="..\src\highscore.h" />
    <ClInclude Include="..\src\hotkeys.h" />
--- a/projects/openttd_vs141.vcxproj.filters
+++ b/projects/openttd_vs141.vcxproj.filters
@@ -651,6 +651,9 @@
    <ClInclude Include="..\src\gui.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\src\guitimer_func.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="..\src\heightmap.h">
      <Filter>Header Files</Filter>
    </ClInclude>