diff options
| author | rubidium <rubidium@openttd.org> | 2012-02-19 19:14:17 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2012-02-19 19:14:17 +0000 |
| commit | a5cb454e94a61a180469e6e9bd2b10e71bb519fb (patch) | |
| tree | 0d7da43d5965ae09243d0baa16a1c0647bdea427 /src | |
| parent | 1c4827cc713b801a39cbd06848424167afedeb95 (diff) | |
| download | openttd-a5cb454e94a61a180469e6e9bd2b10e71bb519fb.tar.xz | |
(svn r23969) -Codechange: trunk heads to 1.3 now
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/script/api/ai_changelog.hpp | 4 | ||||
| -rw-r--r-- | src/script/api/game_changelog.hpp | 4 |
5 files changed, 11 insertions, 3 deletions
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp index ab5f5bde5..b40f07b08 100644 --- a/src/ai/ai_info.cpp +++ b/src/ai/ai_info.cpp @@ -23,7 +23,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; + 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; } #if defined(WIN32) diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp index 947973f4d..e69eae073 100644 --- a/src/game/game_info.cpp +++ b/src/game/game_info.cpp @@ -22,7 +22,7 @@ */ static bool CheckAPIVersion(const char *api_version) { - return strcmp(api_version, "1.2") == 0; + return strcmp(api_version, "1.2") == 0 || strcmp(api_version, "1.3") == 0; } #if defined(WIN32) diff --git a/src/rev.cpp.in b/src/rev.cpp.in index 3ce64b6de..ce21fc503 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -70,7 +70,7 @@ const byte _openttd_revision_modified = !!MODIFIED!!; * final release will always have a lower version number than the released * version, thus making comparisions on specific revisions easy. */ -const uint32 _openttd_newgrf_version = 1 << 28 | 2 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1)); +const uint32 _openttd_newgrf_version = 1 << 28 | 3 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1)); #ifdef __MORPHOS__ /** diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp index 4a8dc5f38..03aee661a 100644 --- a/src/script/api/ai_changelog.hpp +++ b/src/script/api/ai_changelog.hpp @@ -15,6 +15,10 @@ * functions may still be available if you return an older API version * in GetAPIVersion() in info.nut. * + * \b 1.3.0 + * + * 1.3.0 is not yet released. The following changes are not set in stone yet. + * * \b 1.2.0 * * 1.2.0 is not yet released. The following changes are not set in stone yet. diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index f7b659d07..8d1da2f77 100644 --- a/src/script/api/game_changelog.hpp +++ b/src/script/api/game_changelog.hpp @@ -15,6 +15,10 @@ * functions may still be available if you return an older API version * in GetAPIVersion() in info.nut. * + * \b 1.3.0 + * + * 1.3.0 is not yet released. The following changes are not set in stone yet. + * * \b 1.2.0 * \li First stable release with the NoGo framework. */ |