gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-01-31 11:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rubidium 2012-02-19 19:14:17 +00:00
parent 1c4827cc71
commit a5cb454e94
10 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ai/compat_1.2.nut
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.2 API compatability in effect.");

8
bin/ai/compat_1.3.nut Normal file
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
View File

@ -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"; }
}

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

@ -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

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

@ -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

2
src/ai/ai_info.cpp
View File

@ -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)

2
src/game/game_info.cpp
View File

@ -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)

2
src/rev.cpp.in
View File

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

4
src/script/api/ai_changelog.hpp
View File

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

4
src/script/api/game_changelog.hpp
View File

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