cpp/openttd-patchpack/source Changeset - r26708:fcfe8e5e499a

Changeset - r26708:fcfe8e5e499a

Parent rev.

Child rev.

[Not reviewed]

master

0 12 2

Michael Lutz - 23 months ago 2023-01-01 21:52:23
michi@icosahedron.de

Change: Heading for 14 now. (#10302)

14 files changed with 32 insertions and 8 deletions:

CMakeLists.txt

bin/ai/CMakeLists.txt

bin/ai/compat_13.nut

bin/ai/compat_14.nut

bin/game/CMakeLists.txt

bin/game/compat_13.nut

bin/game/compat_14.nut

regression/regression/info.nut

regression/stationlist/info.nut

src/ai/ai_info.cpp

src/game/game_info.cpp

src/saveload/saveload.h

src/script/api/ai_changelog.hpp

src/script/api/game_changelog.hpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -5,7 +5,7 @@ if(NOT BINARY_NAME) @@
 endif()
 project(${BINARY_NAME}
-    VERSION 13.0
+    VERSION 14.0
+)
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)

bin/ai/CMakeLists.txt

➞

Show inline comments

@@ @@ -13,6 +13,8 @@ set(AI_COMPAT_SOURCE_FILES @@
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.10.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.11.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_12.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_13.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_14.nut
+)
 foreach(AI_COMPAT_SOURCE_FILE IN LISTS AI_COMPAT_SOURCE_FILES)

bin/ai/compat_13.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("13 API compatibility in effect.");

bin/ai/compat_14.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/CMakeLists.txt

➞

Show inline comments

@@ @@ -10,6 +10,8 @@ set(GS_COMPAT_SOURCE_FILES @@
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.10.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_1.11.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_12.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_13.nut
 	${CMAKE_CURRENT_SOURCE_DIR}/compat_14.nut
+)
 foreach(GS_COMPAT_SOURCE_FILE IN LISTS GS_COMPAT_SOURCE_FILES)

bin/game/compat_13.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("13 API compatibility in effect.");

bin/game/compat_14.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 "13"; }
+	function GetAPIVersion()  { return "14"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 	function UseAsRandomAI()  { return false; }

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 "13"; }
+	function GetAPIVersion()  { return "14"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "StationList"; }
 	function UseAsRandomAI()  { return false; }

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", "12", "13" };
+	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", "12", "13", "14" };
 	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", "12", "13" };
+	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", "12", "13", "14" };
 	return versions.find(api_version) != versions.end();
+}

src/saveload/saveload.h

➞

Show inline comments

@@ @@ -342,7 +342,7 @@ enum SaveLoadVersion : uint16 { @@
 	SLV_REPAIR_OBJECT_DOCKING_TILES,        ///< 299  PR#9594 v12.0  Fixing issue with docking tiles overlapping objects.
 	SLV_U64_TICK_COUNTER,                   ///< 300  PR#10035 Make _tick_counter 64bit to avoid wrapping.
 	SLV_LAST_LOADING_TICK,                  ///< 301  PR#9693 Store tick of last loading for vehicles.
 	SLV_MULTITRACK_LEVEL_CROSSINGS,         ///< 302  PR#9931 Multi-track level crossings.
+	SLV_MULTITRACK_LEVEL_CROSSINGS,         ///< 302  PR#9931 v13.0  Multi-track level crossings.
 	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 13.0
+ * \b 14.0
+ *
  * This version is not yet released. The following changes are not set in stone yet.
+ *
  * \b 13.0
+ *
  * API additions:
  * \li AICargo::GetWeight
  * \li AIIndustryType::ResolveNewGRFID

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 13.0
+ * \b 14.0
+ *
  * This version is not yet released. The following changes are not set in stone yet.
+ *
  * \b 13.0
+ *
  * API additions:
  * \li GSCargo::GetWeight
  * \li GSIndustryType::ResolveNewGRFID

0 comments (0 inline, 0 general)