diff --git a/CMakeLists.txt b/CMakeLists.txt index 60f4bc43ff..a39d2dea85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ if(NOT BINARY_NAME) endif() project(${BINARY_NAME} - VERSION 15.0 + VERSION 16.0 LANGUAGES CXX ) diff --git a/bin/ai/CMakeLists.txt b/bin/ai/CMakeLists.txt index 7fb23cada3..8b54f74973 100644 --- a/bin/ai/CMakeLists.txt +++ b/bin/ai/CMakeLists.txt @@ -15,6 +15,7 @@ set(AI_COMPAT_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/compat_12.nut ${CMAKE_CURRENT_SOURCE_DIR}/compat_13.nut ${CMAKE_CURRENT_SOURCE_DIR}/compat_14.nut + ${CMAKE_CURRENT_SOURCE_DIR}/compat_15.nut ) foreach(AI_COMPAT_SOURCE_FILE IN LISTS AI_COMPAT_SOURCE_FILES) diff --git a/bin/ai/compat_15.nut b/bin/ai/compat_15.nut new file mode 100644 index 0000000000..8e1fb2084a --- /dev/null +++ b/bin/ai/compat_15.nut @@ -0,0 +1,8 @@ +/* + * 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 . + */ + +/* This file contains code to downgrade the API from 16 to 15. */ diff --git a/bin/game/CMakeLists.txt b/bin/game/CMakeLists.txt index 0b48e97857..d0b5448997 100644 --- a/bin/game/CMakeLists.txt +++ b/bin/game/CMakeLists.txt @@ -12,6 +12,7 @@ set(GS_COMPAT_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/compat_12.nut ${CMAKE_CURRENT_SOURCE_DIR}/compat_13.nut ${CMAKE_CURRENT_SOURCE_DIR}/compat_14.nut + ${CMAKE_CURRENT_SOURCE_DIR}/compat_15.nut ) foreach(GS_COMPAT_SOURCE_FILE IN LISTS GS_COMPAT_SOURCE_FILES) diff --git a/bin/game/compat_15.nut b/bin/game/compat_15.nut new file mode 100644 index 0000000000..8e1fb2084a --- /dev/null +++ b/bin/game/compat_15.nut @@ -0,0 +1,8 @@ +/* + * 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 . + */ + +/* This file contains code to downgrade the API from 16 to 15. */ diff --git a/regression/regression/info.nut b/regression/regression/info.nut index 383f219cd7..78016a5376 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 "15"; } + function GetAPIVersion() { return "16"; } 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 a1a10466dd..c7ac156697 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 "15"; } + function GetAPIVersion() { return "16"; } function GetDate() { return "2007-03-18"; } function CreateInstance() { return "StationList"; } function UseAsRandomAI() { return false; } diff --git a/src/ai/ai_info.hpp b/src/ai/ai_info.hpp index 88da5b1ca5..ebdf69cd1c 100644 --- a/src/ai/ai_info.hpp +++ b/src/ai/ai_info.hpp @@ -16,7 +16,7 @@ class AIInfo : public ScriptInfo { public: /* All valid AI API versions, in order. */ - static constexpr std::string_view ApiVersions[]{ "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", "15" }; + static constexpr std::string_view ApiVersions[]{ "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", "15", "16" }; AIInfo(); diff --git a/src/game/game_info.hpp b/src/game/game_info.hpp index 191b520aec..c6a2e7a5e8 100644 --- a/src/game/game_info.hpp +++ b/src/game/game_info.hpp @@ -16,7 +16,7 @@ class GameInfo : public ScriptInfo { public: /* All valid GameScript API versions, in order. */ - static constexpr std::string_view ApiVersions[]{ "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "12", "13", "14", "15" }; + static constexpr std::string_view ApiVersions[]{ "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "1.10", "1.11", "12", "13", "14", "15", "16" }; GameInfo(); diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 2b0f10cd8b..961bb7e10f 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -411,7 +411,7 @@ enum SaveLoadVersion : uint16_t { SLV_DOCKS_UNDER_BRIDGES, ///< 360 PR#14594 Allow docks under bridges. SLV_LOCKS_UNDER_BRIDGES, ///< 361 PR#14595 Allow locks under bridges. - SLV_ENGINE_MULTI_RAILTYPE, ///< 362 PR#14357 Train engines can have multiple railtypes. + SLV_ENGINE_MULTI_RAILTYPE, ///< 362 PR#14357 v15.0 Train engines can have multiple railtypes. SL_MAX_VERSION, ///< Highest possible saveload version }; diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp index 22df5f418a..5e46c4847c 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 15.0 + * \b 16.0 * * This version is not yet released. The following changes are not set in stone yet. * + * \b 15.0 + * * API additions: * \li AIEventVehicleCrashed::GetVictims * \li AIEventVehicleCrashed::GetVehicleOwner diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index f7096ab66c..62c0a73cb0 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 15.0 + * \b 16.0 * * This version is not yet released. The following changes are not set in stone yet. * + * \b 15.0 + * * API additions: * \li GSEventVehicleCrashed::GetVictims * \li GSEventVehicleCrashed::GetVehicleOwner