cpp/openttd-patchpack/source Changeset - r23397:3e09f9e42e43

Changeset - r23397:3e09f9e42e43

Parent rev.

Child rev.

[Not reviewed]

master

0 14 2

frosch - 5 years ago 2019-03-03 19:51:57
github@elsenhans.name

Change: Heading for 1.10 now (#7319)

16 files changed with 45 insertions and 16 deletions:

.gitignore

bin/ai/compat_1.10.nut

bin/ai/compat_1.9.nut

bin/ai/regression/regression_info.nut

bin/game/compat_1.10.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/saveload/saveload.h

src/script/api/ai_changelog.hpp

src/script/api/game_changelog.hpp

0 comments (0 inline, 0 general)

.gitignore

➞

Show inline comments

@@ @@ -13,6 +13,9 @@ bin/baseset/* @@
 !bin/baseset/no_sound.obs
 !bin/baseset/no_music.obm
 !bin/baseset/orig_*.obm
 !bin/game
 bin/game/*
 !bin/game/compat*.nut
 !bin/scripts
 bin/scripts/*
 !bin/scripts/*.example

bin/ai/compat_1.10.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/compat_1.9.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.9 API compatibility in effect.");

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.9"; }
+	function GetAPIVersion()  { return "1.10"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
+}

bin/game/compat_1.10.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/game/compat_1.9.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.9 API compatibility in effect.");

os/os2/installer/make_installer.cmd

➞

Show inline comments

 @echo off
-set OPENTTD_VERSION=1.9.0
+set OPENTTD_VERSION=1.10.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.9.beta3
+Version:        1.10.beta1
 Release:        0
-%define srcver  1.9.0-beta3
+%define srcver  1.10.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 9
+!define APPV_MINOR 10
 !define APPV_MAINT 0
 !define APPV_BUILD 2
 !define APPV_EXTRA "-beta3"
 !define APPV_BUILD 0
 !define APPV_EXTRA "-beta1"
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version

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.9") == 0;
+			strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0 || strcmp(api_version, "1.10") == 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.9") == 0;
+			strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0 || strcmp(api_version, "1.10") == 0;
+}
 #if defined(_WIN32)

src/os/windows/ottdres.rc.in

➞

Show inline comments

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

src/rev.cpp.in

➞

Show inline comments

@@ @@ -82,7 +82,7 @@ const byte _openttd_revision_tagged = !! @@
  * 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 | 9 << 24 | 0 << 20 | !!ISSTABLETAG!! << 19 | 28004;
+const uint32 _openttd_newgrf_version = 1 << 28 | 10 << 24 | 0 << 20 | !!ISSTABLETAG!! << 19 | 28004;
 #ifdef __MORPHOS__
 /**

src/saveload/saveload.h

➞

Show inline comments

@@ @@ -266,7 +266,7 @@ enum SaveLoadVersion : uint16 { @@
 	SLV_185,                                ///< 185   25620 Storybooks
 	SLV_186,                                ///< 186   25833 Objects storage
 	SLV_187,                                ///< 187   25899 Linkgraph - restricted flows
 	SLV_188,                                ///< 188   26169 FS#5831 Unify RV travel time
+	SLV_188,                                ///< 188   26169 v1.4  FS#5831 Unify RV travel time
 	SLV_189,                                ///< 189   26450 Heirarchical vehicle subgroups
 	SLV_190,                                ///< 190   26547 Separate order travel and wait times
@@ @@ -290,7 +290,7 @@ enum SaveLoadVersion : uint16 { @@
 	SLV_GROUP_LIVERIES,                     ///< 205  PR#7108 Livery storage change and group liveries.
 	SLV_SHIPS_STOP_IN_LOCKS,                ///< 206  PR#7150 Ship/lock movement changes.
 	SLV_FIX_CARGO_MONITOR,                  ///< 207  PR#7175 Cargo monitor data packing fix to support 64 cargotypes.
+	SLV_FIX_CARGO_MONITOR,                  ///< 207  PR#7175 v1.9  Cargo monitor data packing fix to support 64 cargotypes.
 	SL_MAX_VERSION,                         ///< Highest possible saveload version
 };

src/script/api/ai_changelog.hpp

➞

Show inline comments

@@ @@ -15,9 +15,12 @@ @@
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
+ *
  * \b 1.10.0
+ *
  * This version is not yet released. The following changes are not set in stone yet.
+ *
  * \b 1.9.0
+ *
  * 1.9.0 is not yet released. The following changes are not set in stone yet.
  * API additions:
  * \li AIAirport::GetMonthlyMaintenanceCost
  * \li AIGroup::SetParent

src/script/api/game_changelog.hpp

➞

Show inline comments

@@ @@ -15,9 +15,12 @@ @@
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
+ *
  * \b 1.10.0
+ *
  * This version is not yet released. The following changes are not set in stone yet.
+ *
  * \b 1.9.0
+ *
  * 1.9.0 is not yet released. The following changes are not set in stone yet.
  * API additions:
  * \li GSAirport::GetMonthlyMaintenanceCost
  * \li GSClient

0 comments (0 inline, 0 general)