diff options
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/os/windows/ottdres.rc.in | 4 | ||||
| -rw-r--r-- | src/rev.cpp.in | 2 | ||||
| -rw-r--r-- | src/saveload/saveload.cpp | 2 | ||||
| -rw-r--r-- | src/script/api/ai_changelog.hpp | 6 | ||||
| -rw-r--r-- | src/script/api/game_changelog.hpp | 6 |
7 files changed, 14 insertions, 10 deletions
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp index 017a168f4..6217920f8 100644 --- a/src/ai/ai_info.cpp +++ b/src/ai/ai_info.cpp @@ -28,7 +28,7 @@ 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.5") == 0 || strcmp(api_version, "1.6"); } #if defined(WIN32) diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp index e0a6027fc..9bb36d1aa 100644 --- a/src/game/game_info.cpp +++ b/src/game/game_info.cpp @@ -25,7 +25,7 @@ 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.5") == 0 || strcmp(api_version, "1.6") == 0; } #if defined(WIN32) diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in index ae42f58fc..8384b91e7 100644 --- a/src/os/windows/ottdres.rc.in +++ b/src/os/windows/ottdres.rc.in @@ -79,8 +79,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,0,!!REVISION!! - PRODUCTVERSION 1,5,0,!!REVISION!! + FILEVERSION 1,6,0,!!REVISION!! + PRODUCTVERSION 1,6,0,!!REVISION!! FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/rev.cpp.in b/src/rev.cpp.in index c20838205..7e27859ce 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -72,7 +72,7 @@ const byte _openttd_revision_modified = !!MODIFIED!!; * 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 | 5 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1)); +const uint32 _openttd_newgrf_version = 1 << 28 | 6 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1)); #ifdef __MORPHOS__ /** diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 717777804..b7c04fa74 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -261,7 +261,7 @@ * 191 26646 * 192 26700 * 193 26802 - * 194 26881 + * 194 26881 1.5.x */ extern const uint16 SAVEGAME_VERSION = 194; ///< Current savegame version of OpenTTD. diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp index b51d1b268..0cf57fe0f 100644 --- a/src/script/api/ai_changelog.hpp +++ b/src/script/api/ai_changelog.hpp @@ -15,9 +15,11 @@ * functions may still be available if you return an older API version * in GetAPIVersion() in info.nut. * - * \b 1.5.0 + * \b 1.6.0 + * + * 1.6.0 is not yet released. The following changes are not set in stone yet. * - * 1.5.0 is not yet released. The following changes are not set in stone yet. + * \b 1.5.0 * * API additions: * \li AIList::SwapList diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index 8ff41f775..8c01be8d1 100644 --- a/src/script/api/game_changelog.hpp +++ b/src/script/api/game_changelog.hpp @@ -15,9 +15,11 @@ * functions may still be available if you return an older API version * in GetAPIVersion() in info.nut. * - * \b 1.5.0 + * \b 1.6.0 + * + * 1.6.0 is not yet released. The following changes are not set in stone yet. * - * 1.5.0 is not yet released. The following changes are not set in stone yet. + * \b 1.5.0 * * API additions: * \li GSList::SwapList |