diff options
author | glx <glx@openttd.org> | 2020-02-08 22:44:31 +0100 |
---|---|---|
committer | glx22 <glx22@users.noreply.github.com> | 2020-02-08 23:38:49 +0100 |
commit | 2f264f2c92d202608cb54cf6f06abf8e2aa0e875 (patch) | |
tree | e24154b2edd5aeb03f338314dc24f1ee3b93bca0 /src | |
parent | a499e9acdd385b57dd43caf88af3a6f7f53716ba (diff) | |
download | openttd-2f264f2c92d202608cb54cf6f06abf8e2aa0e875.tar.xz |
Change: Heading for 1.11 now
Diffstat (limited to 'src')
-rw-r--r-- | src/ai/ai_info.cpp | 3 | ||||
-rw-r--r-- | src/game/game_info.cpp | 3 | ||||
-rw-r--r-- | src/os/windows/ottdres.rc.in | 4 | ||||
-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 |
7 files changed, 14 insertions, 8 deletions
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp index 2d80003f6..6e1ef6cec 100644 --- a/src/ai/ai_info.cpp +++ b/src/ai/ai_info.cpp @@ -27,7 +27,8 @@ static bool CheckAPIVersion(const char *api_version) return strcmp(api_version, "0.7") == 0 || strcmp(api_version, "1.0") == 0 || strcmp(api_version, "1.1") == 0 || strcmp(api_version, "1.2") == 0 || strcmp(api_version, "1.3") == 0 || strcmp(api_version, "1.4") == 0 || strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0 || strcmp(api_version, "1.7") == 0 || - strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0 || strcmp(api_version, "1.10") == 0; + strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0 || strcmp(api_version, "1.10") == 0 || + strcmp(api_version, "1.11") == 0; } #if defined(_WIN32) diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp index 91a463bed..a039401b3 100644 --- a/src/game/game_info.cpp +++ b/src/game/game_info.cpp @@ -24,7 +24,8 @@ static bool CheckAPIVersion(const char *api_version) { return strcmp(api_version, "1.2") == 0 || strcmp(api_version, "1.3") == 0 || strcmp(api_version, "1.4") == 0 || strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0 || strcmp(api_version, "1.7") == 0 || - strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0 || strcmp(api_version, "1.10") == 0; + strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0 || strcmp(api_version, "1.10") == 0 || + strcmp(api_version, "1.11") == 0; } #if defined(_WIN32) diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in index 5b375790a..af27de4bd 100644 --- a/src/os/windows/ottdres.rc.in +++ b/src/os/windows/ottdres.rc.in @@ -77,8 +77,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,10,0,!!ISODATE!! - PRODUCTVERSION 1,10,0,!!ISODATE!! + FILEVERSION 1,11,0,!!ISODATE!! + PRODUCTVERSION 1,11,0,!!ISODATE!! FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/rev.cpp.in b/src/rev.cpp.in index 003fb5556..48b29f349 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -80,4 +80,4 @@ const byte _openttd_revision_tagged = !!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 | 10 << 24 | 0 << 20 | !!ISSTABLETAG!! << 19 | 28004; +const uint32 _openttd_newgrf_version = 1 << 28 | 11 << 24 | 0 << 20 | !!ISSTABLETAG!! << 19 | 28004; diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 14c8c3231..eeb0c58f2 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -301,7 +301,7 @@ enum SaveLoadVersion : uint16 { SLV_SCRIPT_MEMLIMIT, ///< 215 PR#7516 Limit on AI/GS memory consumption. SLV_MULTITILE_DOCKS, ///< 216 PR#7380 Multiple docks per station. SLV_TRADING_AGE, ///< 217 PR#7780 Configurable company trading age. - SLV_ENDING_YEAR, ///< 218 PR#7747 Configurable ending year. + SLV_ENDING_YEAR, ///< 218 PR#7747 v1.10 Configurable ending year. SL_MAX_VERSION, ///< Highest possible saveload version }; diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp index 9eea9ab15..bcb7df67f 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.10.0 + * \b 1.11.0 * * This version is not yet released. The following changes are not set in stone yet. * + * \b 1.10.0 + * * API additions: * \li AIGroup::SetPrimaryColour * \li AIGroup::SetSecondaryColour diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index 235dcee98..df8c663a0 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.10.0 + * \b 1.11.0 * * This version is not yet released. The following changes are not set in stone yet. * + * \b 1.10.0 + * * API additions: * \li GSVehicle::BuildVehicleWithRefit * \li GSVehicle::GetBuildWithRefitCapacity |