diff options
| author | rubidium <rubidium@openttd.org> | 2011-02-14 20:20:57 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-02-14 20:20:57 +0000 |
| commit | 22afd8396407ce1d8e738833a60f180b526a8550 (patch) | |
| tree | 93b502b1ae72cfb272233347d86081a7a30ca005 /src | |
| parent | 1b2ef664162a4b9e684c8847e80db4269e97beec (diff) | |
| download | openttd-22afd8396407ce1d8e738833a60f180b526a8550.tar.xz | |
(svn r22083) -Change: trunk is heading towards 1.2 now
Diffstat (limited to 'src')
| -rw-r--r-- | src/ai/ai_info.cpp | 2 | ||||
| -rw-r--r-- | src/ai/api/ai_changelog.hpp | 4 | ||||
| -rw-r--r-- | src/ai/api/ai_info_docs.hpp | 1 | ||||
| -rw-r--r-- | src/os/windows/ottdres.rc.in | 4 | ||||
| -rw-r--r-- | src/rev.cpp.in | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp index be2abf715..a1d635ac0 100644 --- a/src/ai/ai_info.cpp +++ b/src/ai/ai_info.cpp @@ -57,7 +57,7 @@ AILibrary::~AILibrary() */ 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; + 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; } /* static */ SQInteger AIInfo::Constructor(HSQUIRRELVM vm) diff --git a/src/ai/api/ai_changelog.hpp b/src/ai/api/ai_changelog.hpp index cd35b5bfa..c0fbe4242 100644 --- a/src/ai/api/ai_changelog.hpp +++ b/src/ai/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.2.0 + * + * 1.2.0 is not yet released. The following changes are not set in stone yet. + * * \b 1.1.0 * * 1.1.0 is not yet released. The following changes are not set in stone yet. diff --git a/src/ai/api/ai_info_docs.hpp b/src/ai/api/ai_info_docs.hpp index 8eb54d3c1..c0c68935e 100644 --- a/src/ai/api/ai_info_docs.hpp +++ b/src/ai/api/ai_info_docs.hpp @@ -150,6 +150,7 @@ public: * - "0.7" * - "1.0" * - "1.1" + * - "1.2" * * @return The version this AI is compatible with. * @note This function is optional. diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in index 57c65838e..de2d0bec0 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,1,0,!!REVISION!! - PRODUCTVERSION 1,1,0,!!REVISION!! + FILEVERSION 1,2,0,!!REVISION!! + PRODUCTVERSION 1,2,0,!!REVISION!! FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/rev.cpp.in b/src/rev.cpp.in index ae867298d..6eb90dc4a 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -60,7 +60,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 | 1 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1)); +const uint32 _openttd_newgrf_version = 1 << 28 | 2 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1)); #ifdef __MORPHOS__ /** |