summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatric Stout <truebrain@openttd.org>2021-09-25 13:48:03 +0200
committerGitHub <noreply@github.com>2021-09-25 13:48:03 +0200
commit394c749b6b0fa3e185734b7e5b92ad71420fdf2c (patch)
tree8778ab3f76393aeece0c92225a0a0510c0c50388
parent39662aabefa851a153b66571a50fd4b78b83ced1 (diff)
downloadopenttd-394c749b6b0fa3e185734b7e5b92ad71420fdf2c.tar.xz
Change: Heading for 13 now (#9573)
-rw-r--r--CMakeLists.txt2
-rw-r--r--bin/ai/compat_12.nut2
-rw-r--r--bin/ai/compat_13.nut6
-rw-r--r--bin/game/compat_12.nut2
-rw-r--r--bin/game/compat_13.nut6
-rw-r--r--regression/regression/info.nut2
-rw-r--r--regression/stationlist/info.nut2
-rw-r--r--src/ai/ai_info.cpp2
-rw-r--r--src/game/game_info.cpp2
-rw-r--r--src/saveload/saveload.h2
-rw-r--r--src/script/api/ai_changelog.hpp4
-rw-r--r--src/script/api/game_changelog.hpp4
12 files changed, 28 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37e8697e4..4dc733777 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ if(NOT BINARY_NAME)
endif()
project(${BINARY_NAME}
- VERSION 12.0
+ VERSION 13.0
)
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
diff --git a/bin/ai/compat_12.nut b/bin/ai/compat_12.nut
index 3081fb58e..2ff41f8b4 100644
--- a/bin/ai/compat_12.nut
+++ b/bin/ai/compat_12.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("12 API compatibility in effect.");
diff --git a/bin/ai/compat_13.nut b/bin/ai/compat_13.nut
new file mode 100644
index 000000000..3081fb58e
--- /dev/null
+++ b/bin/ai/compat_13.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_12.nut b/bin/game/compat_12.nut
index 3081fb58e..df0858391 100644
--- a/bin/game/compat_12.nut
+++ b/bin/game/compat_12.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("12 API compatibility in effect.");
diff --git a/bin/game/compat_13.nut b/bin/game/compat_13.nut
new file mode 100644
index 000000000..3081fb58e
--- /dev/null
+++ b/bin/game/compat_13.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 1a52cfebb..8799d9862 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 "12"; }
+ function GetAPIVersion() { return "13"; }
function GetDate() { return "2007-03-18"; }
function CreateInstance() { return "Regression"; }
function UseAsRandomAI() { return false; }
diff --git a/regression/stationlist/info.nut b/regression/stationlist/info.nut
index ad91c7645..099a7d12e 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 "12"; }
+ function GetAPIVersion() { return "13"; }
function GetDate() { return "2007-03-18"; }
function CreateInstance() { return "StationList"; }
function UseAsRandomAI() { return false; }
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index 17ad01257..fcd1b5a1a 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", "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();
}
diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp
index 98818e8dd..5f7ba259b 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", "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();
}
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index ad8b368c8..bd0613e55 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -337,7 +337,7 @@ enum SaveLoadVersion : uint16 {
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
};
diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp
index c1ea5e152..2f99ac864 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 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
diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp
index 741d3f56d..8041e779d 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 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