diff options
author | Patric Stout <truebrain@openttd.org> | 2021-03-14 20:47:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-14 20:47:31 +0100 |
commit | 9bfa7198fdd617df4ed41086c62d3806d890573d (patch) | |
tree | 373442349ef0be9c96907ad088e51dc4a6fe347b /src | |
parent | 74c98db1b61c805f7931cc252c30cc62c4eb0c90 (diff) | |
download | openttd-9bfa7198fdd617df4ed41086c62d3806d890573d.tar.xz |
Change: Heading for 1.12 now (#8862)
Diffstat (limited to 'src')
-rw-r--r-- | src/ai/ai_info.cpp | 2 | ||||
-rw-r--r-- | src/game/game_info.cpp | 2 | ||||
-rw-r--r-- | src/rev.cpp.in | 2 | ||||
-rw-r--r-- | src/saveload/saveload.h | 2 | ||||
-rw-r--r-- | src/script/api/ai_changelog.hpp | 4 | ||||
-rw-r--r-- | src/script/api/game_changelog.hpp | 4 |
6 files changed, 10 insertions, 6 deletions
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp index c5280fe5d..985271fa1 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" }; + 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(); } diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp index 77725c5e7..deda2e893 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"}; + 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(); } diff --git a/src/rev.cpp.in b/src/rev.cpp.in index 16c403a67..208588a71 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -85,4 +85,4 @@ const byte _openttd_revision_tagged = ${REV_ISTAG}; * 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; diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 7f4f0d287..e23c9c47f 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -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 }; diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp index a0d9097d9..f63b41fa9 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 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 diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index 737adc7fc..2702a98e7 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 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 |