summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-02-16 00:07:15 +0000
committerrubidium <rubidium@openttd.org>2010-02-16 00:07:15 +0000
commit997d52fc69462116343757310fcd76bc2a2d3b6c (patch)
treef0da708d9387b38fc19d584c03befb740a4c4835
parent3626eb340e5996a9a9e1fa84c9b4023ecc55c952 (diff)
downloadopenttd-997d52fc69462116343757310fcd76bc2a2d3b6c.tar.xz
(svn r19143) -Codechange: trunk's going for 1.1 now.
-rw-r--r--bin/ai/compat_1.0.nut3
-rw-r--r--bin/ai/compat_1.1.nut8
-rw-r--r--bin/ai/regression/regression_info.nut2
-rw-r--r--src/ai/ai_info.cpp2
-rw-r--r--src/rev.cpp.in2
5 files changed, 14 insertions, 3 deletions
diff --git a/bin/ai/compat_1.0.nut b/bin/ai/compat_1.0.nut
index fe985b90d..f14520c1e 100644
--- a/bin/ai/compat_1.0.nut
+++ b/bin/ai/compat_1.0.nut
@@ -6,3 +6,6 @@
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
+
+/* Enable when adding the first compatability code:
+ * AILog.Info("1.0 API compatability in effect"); */
diff --git a/bin/ai/compat_1.1.nut b/bin/ai/compat_1.1.nut
new file mode 100644
index 000000000..fe985b90d
--- /dev/null
+++ b/bin/ai/compat_1.1.nut
@@ -0,0 +1,8 @@
+/* $Id$ */
+
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
diff --git a/bin/ai/regression/regression_info.nut b/bin/ai/regression/regression_info.nut
index 0d70f0824..0fd9952dc 100644
--- a/bin/ai/regression/regression_info.nut
+++ b/bin/ai/regression/regression_info.nut
@@ -6,7 +6,7 @@ class Regression extends AIInfo {
function GetShortName() { return "REGR"; }
function GetDescription() { return "This runs regression-tests on all commands. On the same map the result should always be the same."; }
function GetVersion() { return 1; }
- function GetAPIVersion() { return "1.0"; }
+ function GetAPIVersion() { return "1.1"; }
function GetDate() { return "2007-03-18"; }
function CreateInstance() { return "Regression"; }
}
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index 1b5ad51f1..29abb7e15 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -52,7 +52,7 @@ AILibrary::~AILibrary()
static bool CheckAPIVersion(const char *api_version)
{
- return strcmp(api_version, "0.7") == 0 || strcmp(api_version, "1.0") == 0;
+ return strcmp(api_version, "0.7") == 0 || strcmp(api_version, "1.0") == 0 || strcmp(api_version, "1.1") == 0;
}
/* static */ SQInteger AIInfo::Constructor(HSQUIRRELVM vm)
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index 6e33a64f3..ae867298d 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 | 0 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 1 << 28 | 1 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
#ifdef __MORPHOS__
/**