Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r27192) -Change: heading for 1.6 now

Browse Source
replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
frosch 9 years ago
parent 59d41a89c4
commit 6477356dd2
15 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
bin/ai/compat_1.5.nut
Unescape Escape View File

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

8
bin/ai/compat_1.6.nut
Unescape Escape View File

@ -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/>.
*/

2
bin/ai/regression/regression_info.nut
Unescape Escape View File

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

2
bin/game/compat_1.5.nut
Unescape Escape View File

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

8
bin/game/compat_1.6.nut
Unescape Escape View File

@ -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/>.
*/

2
os/os2/installer/make_installer.cmd
Unescape Escape View File

@ -1,6 +1,6 @@
@echo off
set OPENTTD_VERSION=1.5.0
set OPENTTD_VERSION=1.6.0
set OPENSFX_VERSION=0.8.0
set NOSOUND_VERSION=0.8.0
set OPENGFX_VERSION=1.2.0

4
os/rpm/openttd.spec
Unescape Escape View File

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

6
os/windows/installer/install.nsi
Unescape Escape View File

@ -1,9 +1,9 @@
# Version numbers to update
!define APPV_MAJOR 1
!define APPV_MINOR 5
!define APPV_MINOR 6
!define APPV_MAINT 0
!define APPV_BUILD 1
!define APPV_EXTRA "-beta2"
!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

2
src/ai/ai_info.cpp
Unescape Escape View File

@ -28,7 +28,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 || strcmp(api_version, "1.3") == 0 || strcmp(api_version, "1.4") == 0 ||
strcmp(api_version, "1.5") == 0;
strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6");
}
#if defined(WIN32)

2
src/game/game_info.cpp
Unescape Escape View File

@ -25,7 +25,7 @@
static bool CheckAPIVersion(const char *api_version)
{
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.5") == 0 || strcmp(api_version, "1.6") == 0;
}
#if defined(WIN32)

4
src/os/windows/ottdres.rc.in
Unescape Escape View File

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

2
src/rev.cpp.in
Unescape Escape View File

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

2
src/saveload/saveload.cpp
Unescape Escape View File

@ -261,7 +261,7 @@
* 191 26646
* 192 26700
* 193 26802
* 194 26881
* 194 26881 1.5.x
*/
extern const uint16 SAVEGAME_VERSION = 194; ///< Current savegame version of OpenTTD.

6
src/script/api/ai_changelog.hpp
Unescape Escape View File

@ -15,9 +15,11 @@
* functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut.
*
* \b 1.5.0
* \b 1.6.0
*
* 1.6.0 is not yet released. The following changes are not set in stone yet.
*
* 1.5.0 is not yet released. The following changes are not set in stone yet.
* \b 1.5.0
*
* API additions:
* \li AIList::SwapList

6
src/script/api/game_changelog.hpp
Unescape Escape View File

@ -15,9 +15,11 @@
* functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut.
*
* \b 1.5.0
* \b 1.6.0
*
* 1.6.0 is not yet released. The following changes are not set in stone yet.
*
* 1.5.0 is not yet released. The following changes are not set in stone yet.
* \b 1.5.0
*
* API additions:
* \li GSList::SwapList

Write Preview
Loading…
Cancel
Save