Change: Heading for 1.12 now (#8862)

12 files changed, 28 insertions, 8 deletions

diff --git a/bin/ai/compat_1.11.nut b/bin/ai/compat_1.11.nut
index 3081fb58e..887f3f7fd 100644
--- a/bin/ai/compat_1.11.nut
+++ b/bin/ai/compat_1.11.nut
@@ -4,3 +4,5 @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
+
+AILog.Info("1.11 API compatibility in effect.");
diff --git a/bin/ai/compat_1.12.nut b/bin/ai/compat_1.12.nut
new file mode 100644
index 000000000..3081fb58e
--- /dev/null
+++ b/bin/ai/compat_1.12.nut
@@ -0,0 +1,6 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
diff --git a/bin/game/compat_1.11.nut b/bin/game/compat_1.11.nut
index 3081fb58e..fa240b5d2 100644
--- a/bin/game/compat_1.11.nut
+++ b/bin/game/compat_1.11.nut
@@ -4,3 +4,5 @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
+
+GSLog.Info("1.11 API compatibility in effect.");
diff --git a/bin/game/compat_1.12.nut b/bin/game/compat_1.12.nut
new file mode 100644
index 000000000..3081fb58e
--- /dev/null
+++ b/bin/game/compat_1.12.nut
@@ -0,0 +1,6 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
diff --git a/regression/regression/info.nut b/regression/regression/info.nut
index 758754cfe..340dcff5c 100644
--- a/regression/regression/info.nut
+++ b/regression/regression/info.nut
@@ -4,7 +4,7 @@ class Regression extends AIInfo {
 	function GetShortName()   { return "REGR"; }
 	function GetDescription() { return "This runs regression-tests on some commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.11"; }
+	function GetAPIVersion()  { return "1.12"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }
diff --git a/regression/stationlist/info.nut b/regression/stationlist/info.nut
index 42e5072fd..a58fd20ba 100644
--- a/regression/stationlist/info.nut
+++ b/regression/stationlist/info.nut
@@ -4,7 +4,7 @@ class StationList extends AIInfo {
 	function GetShortName()   { return "REGS"; }
 	function GetDescription() { return "This runs stationlist-tests on some commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.11"; }
+	function GetAPIVersion()  { return "1.12"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "StationList"; }
 }
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index c5280fe5d..985271fa1 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -25,7 +25,7 @@
  */
 static bool CheckAPIVersion(const char *api_version)
 {
-	static const std::set<std::string> versions = { "0.7", "1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11" };
+	static const std::set<std::string> versions = { "0.7", "1.0", "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "1.12" };
 	return versions.find(api_version) != versions.end();
 }
 
diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp
index 77725c5e7..deda2e893 100644
--- a/src/game/game_info.cpp
+++ b/src/game/game_info.cpp
@@ -23,7 +23,7 @@
  */
 static bool CheckAPIVersion(const char *api_version)
 {
-	static const std::set<std::string> versions = {"1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11"};
+	static const std::set<std::string> versions = { "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "1.12" };
 	return versions.find(api_version) != versions.end();
 }
 
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index 16c403a67..208588a71 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -85,4 +85,4 @@ const byte _openttd_revision_tagged = ${REV_ISTAG};
  * final release will always have a lower version number than the released
  * version, thus making comparisons on specific revisions easy.
  */
-const uint32 _openttd_newgrf_version = 1 << 28 | 11 << 24 | 0 << 20 | ${REV_ISSTABLETAG} << 19 | 28004;
+const uint32 _openttd_newgrf_version = 1 << 28 | 12 << 24 | 0 << 20 | ${REV_ISSTABLETAG} << 19 | 28004;
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index 7f4f0d287..e23c9c47f 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -323,7 +323,7 @@ enum SaveLoadVersion : uint16 {
 
 	SLV_GS_INDUSTRY_CONTROL,                ///< 287  PR#7912 and PR#8115 GS industry control.
 	SLV_VEH_MOTION_COUNTER,                 ///< 288  PR#8591 Desync safe motion counter
-	SLV_INDUSTRY_TEXT,                      ///< 289  PR#8576 Additional GS text for industries.
+	SLV_INDUSTRY_TEXT,                      ///< 289  PR#8576 v1.11 Additional GS text for industries.
 
 	SL_MAX_VERSION,                         ///< Highest possible saveload version
 };
diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp
index a0d9097d9..f63b41fa9 100644
--- a/src/script/api/ai_changelog.hpp
+++ b/src/script/api/ai_changelog.hpp
@@ -13,10 +13,12 @@
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
  *
- * \b 1.11.0
+ * \b 1.12.0
  *
  * This version is not yet released. The following changes are not set in stone yet.
  *
+ * \b 1.11.0
+ *
  * API additions:
  * \li AICargo::GetName
  * \li AIPriorityQueue
diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp
index 737adc7fc..2702a98e7 100644
--- a/src/script/api/game_changelog.hpp
+++ b/src/script/api/game_changelog.hpp
@@ -13,10 +13,12 @@
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
  *
- * \b 1.11.0
+ * \b 1.12.0
  *
  * This version is not yet released. The following changes are not set in stone yet.
  *
+ * \b 1.11.0
+ *
  * API additions:
  * \li GSCargo::GetName
  * \li GSEventStoryPageButtonClick