summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2013-02-14 18:58:04 +0000
committerrubidium <rubidium@openttd.org>2013-02-14 18:58:04 +0000
commit7ff6598cd2e1b1387e9d54c7b52f896b0ce2f4ac (patch)
treeaf61b42af980c422540cdf4b5b98cb5266d223c2 /src
parenta3b3db664e7776d19933c6f857257269f3f1e4dc (diff)
downloadopenttd-7ff6598cd2e1b1387e9d54c7b52f896b0ce2f4ac.tar.xz
(svn r25001) -Change: heading for 1.4 now
Diffstat (limited to 'src')
-rw-r--r--src/ai/ai_info.cpp2
-rw-r--r--src/game/game_info.cpp2
-rw-r--r--src/rev.cpp.in2
-rw-r--r--src/script/api/ai_changelog.hpp4
-rw-r--r--src/script/api/game_changelog.hpp4
5 files changed, 11 insertions, 3 deletions
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index b40f07b08..7ea7e3261 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 || strcmp(api_version, "1.3") == 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;
}
#if defined(WIN32)
diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp
index e69eae073..974665ee7 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 || strcmp(api_version, "1.3") == 0;
+ return strcmp(api_version, "1.2") == 0 || strcmp(api_version, "1.3") == 0 || strcmp(api_version, "1.4") == 0;
}
#if defined(WIN32)
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index a50ba799e..cd22a4a8c 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 | 3 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 1 << 28 | 4 << 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 aabe962b5..368954151 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.4.0
+ *
+ * 1.4.0 is not yet released. The following changes are not set in stone yet.
+ *
* \b 1.3.0
*
* 1.3.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 c0721a985..3b7234381 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.4.0
+ *
+ * 1.4.0 is not yet released. The following changes are not set in stone yet.
+ *
* \b 1.3.0
*
* 1.3.0 is not yet released. The following changes are not set in stone yet.