diff options
| author | frosch <frosch@openttd.org> | 2014-03-17 20:02:30 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2014-03-17 20:02:30 +0000 |
| commit | db96a109ff29776e00c6860acdef2d61b81a1f0b (patch) | |
| tree | 0e8743a2261ccfd80e1c6c22b4e56b0eda72457a /src | |
| parent | d470955e403622f9dbe5e465ca4fec5dd2e8c23d (diff) | |
| download | openttd-db96a109ff29776e00c6860acdef2d61b81a1f0b.tar.xz | |
(svn r26406) -Change: heading for 1.5 now
Diffstat (limited to 'src')
| -rw-r--r-- | src/ai/ai_info.cpp | 4 | ||||
| -rw-r--r-- | src/game/game_info.cpp | 3 | ||||
| -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, 14 insertions, 3 deletions
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp index 7ea7e3261..375248d7d 100644 --- a/src/ai/ai_info.cpp +++ b/src/ai/ai_info.cpp @@ -23,7 +23,9 @@ */ 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; + 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; } #if defined(WIN32) diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp index 974665ee7..ab49fea12 100644 --- a/src/game/game_info.cpp +++ b/src/game/game_info.cpp @@ -22,7 +22,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; + 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; } #if defined(WIN32) diff --git a/src/rev.cpp.in b/src/rev.cpp.in index cd22a4a8c..506e641d7 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 comparisons on specific revisions easy. */ -const uint32 _openttd_newgrf_version = 1 << 28 | 4 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1)); +const uint32 _openttd_newgrf_version = 1 << 28 | 5 << 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 e73857dbf..7df7027ab 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.5.0 + * + * 1.5.0 is not yet released. The following changes are not set in stone yet. + * * \b 1.4.0 * * 1.4.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 f6064a1bd..6da64c23b 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.5.0 + * + * 1.5.0 is not yet released. The following changes are not set in stone yet. + * * \b 1.4.0 * * 1.4.0 is not yet released. The following changes are not set in stone yet. |