(svn r22083) -Change: trunk is heading towards 1.2 now

12 files changed, 31 insertions, 10 deletions

diff --git a/bin/ai/compat_1.1.nut b/bin/ai/compat_1.1.nut
index fe985b90d..16440bf92 100644
--- a/bin/ai/compat_1.1.nut
+++ b/bin/ai/compat_1.1.nut
@@ -6,3 +6,5 @@
  * 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/>.
  */
+
+AILog.Info("1.1 API compatability in effect.");
diff --git a/bin/ai/compat_1.2.nut b/bin/ai/compat_1.2.nut
new file mode 100644
index 000000000..fe985b90d
--- /dev/null
+++ b/bin/ai/compat_1.2.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 0fd9952dc..d8e8192e9 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.1"; }
+	function GetAPIVersion()  { return "1.2"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }
diff --git a/os/debian/changelog b/os/debian/changelog
index f000f2f81..7561244af 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,9 @@
+openttd (1.2.0~alpha) unstable; urgency=low
+
+  * Alpha releases of trunk leading to 1.2.0-beta1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 14 Feb 2011 22:00:00 +0100
+
 openttd (1.1.0~beta5) unstable; urgency=low
 
   * New upstream release 1.1.0-beta5
diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd
index 8ec90e69b..1d1d318ad 100644
--- a/os/os2/installer/make_installer.cmd
+++ b/os/os2/installer/make_installer.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set OPENTTD_VERSION=1.1.0-beta5
+set OPENTTD_VERSION=1.2.0-alpha
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=0.7.0
diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec
index bf9ee3e53..362d7f612 100644
--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -13,7 +13,7 @@
 #-------------------------------------------------------------------------------
 
 Name:          openttd
-Version:       1.1.0
+Version:       1.2.0
 Release:       1%{?dist}
 
 Group:         Amusements/Games
diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi
index bb76d998c..071fd1cd7 100644
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -1,9 +1,9 @@
 # Version numbers to update
 !define APPV_MAJOR 1
-!define APPV_MINOR 1
+!define APPV_MINOR 2
 !define APPV_MAINT 0
-!define APPV_BUILD 4
-!define APPV_EXTRA "-beta5"
+!define APPV_BUILD 0
+!define APPV_EXTRA "-alpha"
 
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
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__
 /**