cpp/openttd-patchpack/source Changeset - r22764:564422d7281f

Changeset - r22764:564422d7281f

Parent rev.

Child rev.

[Not reviewed]

master

0 12 2

frosch - 6 years ago 2018-03-14 19:36:41
frosch@openttd.org

(svn r27993) -Change: Heading for 1.9 now

14 files changed with 38 insertions and 10 deletions:

bin/ai/compat_1.8.nut

bin/ai/compat_1.9.nut

bin/ai/regression/regression_info.nut

bin/game/compat_1.8.nut

bin/game/compat_1.9.nut

os/os2/installer/make_installer.cmd

os/rpm/openttd.spec

os/windows/installer/install.nsi

src/ai/ai_info.cpp

src/game/game_info.cpp

src/os/windows/ottdres.rc.in

src/rev.cpp.in

src/script/api/ai_changelog.hpp

src/script/api/game_changelog.hpp

0 comments (0 inline, 0 general)

bin/ai/compat_1.8.nut

➞

Show inline comments

@@ @@ -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.8 API compatibility in effect.");

bin/ai/compat_1.9.nut

➞

Show inline comments

@@ new file 100644 @@
 /* $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/>.
  */

bin/ai/regression/regression_info.nut

➞

Show inline comments

@@ @@ -6,7 +6,7 @@ class Regression extends AIInfo { @@
 	function GetShortName()   { return "REGR"; }
 	function GetDescription() { return "This runs regression-tests on some commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "1.8"; }
+	function GetAPIVersion()  { return "1.9"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
+}

bin/game/compat_1.8.nut

➞

Show inline comments

@@ @@ -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/>.
  */
 GSLog.Info("1.8 API compatibility in effect.");

bin/game/compat_1.9.nut

➞

Show inline comments

@@ new file 100644 @@
 /* $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/>.
  */

os/os2/installer/make_installer.cmd

➞

Show inline comments

 @echo off
-set OPENTTD_VERSION=1.8.0
+set OPENTTD_VERSION=1.9.0
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0

os/rpm/openttd.spec

➞

Show inline comments

@@ @@ -17,9 +17,9 @@ @@
+#
 Name:           openttd
-Version:        1.8.beta1
+Version:        1.9.beta1
 Release:        0
-%define srcver  1.8.0-beta1
+%define srcver  1.9.0-beta1
 Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
 License:        GPL-2.0
 Group:          Amusements/Games/Strategy/Other

os/windows/installer/install.nsi

➞

Show inline comments

 # Version numbers to update
 !define APPV_MAJOR 1
-!define APPV_MINOR 8
+!define APPV_MINOR 9
 !define APPV_MAINT 0
 !define APPV_BUILD 0
 !define APPV_EXTRA "-beta1"

src/ai/ai_info.cpp

➞

Show inline comments

@@ @@ -29,7 +29,7 @@ static bool CheckAPIVersion(const char * @@
 	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 ||
 			strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0 || strcmp(api_version, "1.7") == 0 ||
 			strcmp(api_version, "1.8") == 0;
+			strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0;
+}
 #if defined(WIN32)

src/game/game_info.cpp

➞

Show inline comments

@@ @@ -26,7 +26,7 @@ static bool CheckAPIVersion(const char * @@
+{
 	return strcmp(api_version, "1.2") == 0 || strcmp(api_version, "1.3") == 0 || strcmp(api_version, "1.4") == 0 ||
 			strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0 || strcmp(api_version, "1.7") == 0 ||
 			strcmp(api_version, "1.8") == 0;
+			strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0;
+}
 #if defined(WIN32)

src/os/windows/ottdres.rc.in

➞

Show inline comments

@@ @@ -79,8 +79,8 @@ END @@
 //
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 1,8,0,!!REVISION!!
  PRODUCTVERSION 1,8,0,!!REVISION!!
  FILEVERSION 1,9,0,!!REVISION!!
  PRODUCTVERSION 1,9,0,!!REVISION!!
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

src/rev.cpp.in

➞

Show inline comments

@@ @@ -72,7 +72,7 @@ const byte _openttd_revision_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 | 8 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 1 << 28 | 9 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
 #ifdef __MORPHOS__
 /**

src/script/api/ai_changelog.hpp

➞

Show inline comments

@@ @@ -15,6 +15,10 @@ @@
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
+ *
  * \b 1.9.0
+ *
  * 1.9.0 is not yet released. The following changes are not set in stone yet.
+ *
  * \b 1.8.0
+ *
  * 1.8.0 is not yet released. The following changes are not set in stone yet.

src/script/api/game_changelog.hpp

➞

Show inline comments

@@ @@ -15,6 +15,10 @@ @@
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
+ *
  * \b 1.9.0
+ *
  * 1.9.0 is not yet released. The following changes are not set in stone yet.
+ *
  * \b 1.8.0
+ *
  * 1.8.0 is not yet released. The following changes are not set in stone yet.

0 comments (0 inline, 0 general)