(svn r23969) -Codechange: trunk heads to 1.3 now

10 files changed, 26 insertions, 8 deletions

diff --git a/bin/ai/compat_1.2.nut b/bin/ai/compat_1.2.nut
index fe985b90d..f039c59d8 100644
--- a/bin/ai/compat_1.2.nut
+++ b/bin/ai/compat_1.2.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.2 API compatability in effect.");
diff --git a/bin/ai/compat_1.3.nut b/bin/ai/compat_1.3.nut
new file mode 100644
index 000000000..fe985b90d
--- /dev/null
+++ b/bin/ai/compat_1.3.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 d8e8192e9..e4846840e 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.2"; }
+	function GetAPIVersion()  { return "1.3"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }
diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd
index 198f85927..c683a5395 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.2.0-beta4
+set OPENTTD_VERSION=1.3.0-alpha
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0
diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi
index eda407ff7..d5a9ede86 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 2
+!define APPV_MINOR 3
 !define APPV_MAINT 0
-!define APPV_BUILD 3
-!define APPV_EXTRA "-beta4"
+!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 ab5f5bde5..b40f07b08 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;
+	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;
 }
 
 #if defined(WIN32)
diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp
index 947973f4d..e69eae073 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;
+	return strcmp(api_version, "1.2") == 0 || strcmp(api_version, "1.3") == 0;
 }
 
 #if defined(WIN32)
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index 3ce64b6de..ce21fc503 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 comparisions on specific revisions easy.
  */
-const uint32 _openttd_newgrf_version = 1 << 28 | 2 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 1 << 28 | 3 << 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 4a8dc5f38..03aee661a 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.3.0
+ *
+ * 1.3.0 is not yet released. The following changes are not set in stone yet.
+ *
  * \b 1.2.0
  *
  * 1.2.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 f7b659d07..8d1da2f77 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.3.0
+ *
+ * 1.3.0 is not yet released. The following changes are not set in stone yet.
+ *
  * \b 1.2.0
  * \li First stable release with the NoGo framework.
  */