cpp/openttd-patchpack/source Changeset - r25054:fc5b19a7cb0f

Changeset - r25054:fc5b19a7cb0f

Parent rev.

Child rev.

[Not reviewed]

master

0 10 2

Patric Stout - 3 years ago 2021-03-14 19:47:31
truebrain@openttd.org

Change: Heading for 1.12 now (#8862)

12 files changed with 28 insertions and 8 deletions:

bin/ai/compat_1.11.nut

bin/ai/compat_1.12.nut

bin/game/compat_1.11.nut

bin/game/compat_1.12.nut

regression/regression/info.nut

regression/stationlist/info.nut

src/ai/ai_info.cpp

src/game/game_info.cpp

src/rev.cpp.in

src/saveload/saveload.h

src/script/api/ai_changelog.hpp

src/script/api/game_changelog.hpp

0 comments (0 inline, 0 general)

bin/ai/compat_1.11.nut

➞

Show inline comments

@@ @@ -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.");

bin/ai/compat_1.12.nut

➞

Show inline comments

@@ new file 100644 @@
 /*
  * 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/>.
  */

bin/game/compat_1.11.nut

➞

Show inline comments

@@ @@ -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.");

bin/game/compat_1.12.nut

➞

Show inline comments

@@ new file 100644 @@
 /*
  * 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/>.
  */

regression/regression/info.nut

➞

Show inline comments

@@ @@ -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"; }
+}

regression/stationlist/info.nut

➞

Show inline comments

@@ @@ -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"; }
+}

src/ai/ai_info.cpp

➞

Show inline comments

@@ @@ -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();
+}

src/game/game_info.cpp

➞

Show inline comments

@@ @@ -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();
+}

src/rev.cpp.in

➞

Show inline comments

@@ @@ -85,4 +85,4 @@ const byte _openttd_revision_tagged = ${ @@
  * 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;

src/saveload/saveload.h

➞

Show inline comments

@@ @@ -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
 };

src/script/api/ai_changelog.hpp

➞

Show inline comments

@@ @@ -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

src/script/api/game_changelog.hpp

➞

Show inline comments

@@ @@ -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

0 comments (0 inline, 0 general)