cpp/openttd-patchpack/source Changeset - r25988:ad2fd577c934

Changeset - r25988:ad2fd577c934

Parent rev.

Child rev.

[Not reviewed]

master

0 10 2

Patric Stout - 3 years ago 2021-09-25 11:48:03
truebrain@openttd.org

Change: Heading for 13 now (#9573)

12 files changed with 28 insertions and 8 deletions:

CMakeLists.txt

bin/ai/compat_12.nut

bin/ai/compat_13.nut

bin/game/compat_12.nut

bin/game/compat_13.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

@@ @@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.9) @@
 if(NOT BINARY_NAME)
     set(BINARY_NAME openttd)
 endif()
 project(${BINARY_NAME}
-    VERSION 12.0
+    VERSION 13.0
+)
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     message(FATAL_ERROR "In-source builds not allowed. Please run \"cmake ..\" from the build directory. You may need to delete \"${CMAKE_SOURCE_DIR}/CMakeCache.txt\" first.")
 endif()

bin/ai/compat_12.nut

➞

Show inline comments

 /*
  * 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/>.
  */
 AILog.Info("12 API compatibility in effect.");

bin/ai/compat_13.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_12.nut

➞

Show inline comments

 /*
  * 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/>.
  */
 GSLog.Info("12 API compatibility in effect.");

bin/game/compat_13.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

 class Regression extends AIInfo {
 	function GetAuthor()      { return "OpenTTD NoAI Developers Team"; }
 	function GetName()        { return "Regression"; }
 	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 "12"; }
+	function GetAPIVersion()  { return "13"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 	function UseAsRandomAI()  { return false; }
+}
 RegisterAI(Regression());

regression/stationlist/info.nut

➞

Show inline comments

 class StationList extends AIInfo {
 	function GetAuthor()      { return "OpenTTD NoAI Developers Team"; }
 	function GetName()        { return "StationList"; }
 	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 "12"; }
+	function GetAPIVersion()  { return "13"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "StationList"; }
 	function UseAsRandomAI()  { return false; }
+}
 RegisterAI(StationList());

src/ai/ai_info.cpp

➞

Show inline comments

@@ @@ -22,13 +22,13 @@ @@
 /**
  * Check if the API version provided by the AI is supported.
  * @param api_version The API version as provided by the AI.
  */
 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" };
+	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" };
 	return versions.find(api_version) != versions.end();
+}
 #if defined(_WIN32)
 #undef GetClassName
 #endif /* _WIN32 */

src/game/game_info.cpp

➞

Show inline comments

@@ @@ -20,13 +20,13 @@ @@
 /**
  * Check if the API version provided by the Game is supported.
  * @param api_version The API version as provided by the Game.
  */
 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" };
+	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" };
 	return versions.find(api_version) != versions.end();
+}
 #if defined(_WIN32)
 #undef GetClassName
 #endif /* _WIN32 */

src/saveload/saveload.h

➞

Show inline comments

@@ @@ -334,13 +334,13 @@ enum SaveLoadVersion : uint16 { @@
 	SLV_CUSTOM_SUBSIDY_DURATION,            ///< 292  PR#9081 Configurable subsidy duration.
 	SLV_SAVELOAD_LIST_LENGTH,               ///< 293  PR#9374 Consistency in list length with SL_STRUCT / SL_STRUCTLIST / SL_DEQUE / SL_REFLIST.
 	SLV_RIFF_TO_ARRAY,                      ///< 294  PR#9375 Changed many CH_RIFF chunks to CH_ARRAY chunks.
 	SLV_TABLE_CHUNKS,                       ///< 295  PR#9322 Introduction of CH_TABLE and CH_SPARSE_TABLE.
 	SLV_SCRIPT_INT64,                       ///< 296  PR#9415 SQInteger is 64bit but was saved as 32bit.
 	SLV_LINKGRAPH_TRAVEL_TIME,              ///< 297  PR#9457 Store travel time in the linkgraph.
+	SLV_LINKGRAPH_TRAVEL_TIME,              ///< 297  PR#9457 v12  Store travel time in the linkgraph.
 	SL_MAX_VERSION,                         ///< Highest possible saveload version
 };
 /** Save or load result codes. */
 enum SaveOrLoadResult {

src/script/api/ai_changelog.hpp

➞

Show inline comments

@@ @@ -10,16 +10,18 @@ @@
+ *
  * Only new / renamed / deleted api functions will be listed here. A list of
  * bug fixes can be found in the normal changelog. Note that removed API
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
+ *
- * \b 12.0
+ * \b 13.0
+ *
  * This version is not yet released. The following changes are not set in stone yet.
+ *
  * \b 12.0
+ *
  * API additions:
  * \li AINewGRF
  * \li AINewGRFList
  * \li AIGroup::GetNumVehicles
  * \li AIMarine::BT_LOCK
  * \li AIMarine::BT_CANAL

src/script/api/game_changelog.hpp

➞

Show inline comments

@@ @@ -10,16 +10,18 @@ @@
+ *
  * Only new / renamed / deleted api functions will be listed here. A list of
  * bug fixes can be found in the normal changelog. Note that removed API
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
+ *
- * \b 12.0
+ * \b 13.0
+ *
  * This version is not yet released. The following changes are not set in stone yet.
+ *
  * \b 12.0
+ *
  * API additions:
  * \li GSNewGRF
  * \li GSNewGRFList
  * \li GSMarine::BT_LOCK
  * \li GSMarine::BT_CANAL
  * \li GSTile::IsSeaTile

0 comments (0 inline, 0 general)