From 8ff9499fe2095d17856e8eac3e698d2af96e17d8 Mon Sep 17 00:00:00 2001 From: frosch Date: Mon, 17 Mar 2014 20:16:05 +0000 Subject: [PATCH] (svn r26409) -Update: Version number in some more places. --- bin/ai/regression/regression_info.nut | 2 +- os/os2/installer/make_installer.cmd | 2 +- os/rpm/openttd.spec | 4 ++-- os/windows/installer/install.nsi | 6 +++--- src/os/windows/ottdres.rc.in | 4 ++-- src/saveload/saveload.cpp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/ai/regression/regression_info.nut b/bin/ai/regression/regression_info.nut index e4846840e8..6eb19140d1 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.3"; } + function GetAPIVersion() { return "1.5"; } 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 1aa4c8456d..289b6ea54a 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.4.0 +set OPENTTD_VERSION=1.5.0 set OPENSFX_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0 set OPENGFX_VERSION=1.2.0 diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec index 91ffc8dfdc..cd19fd9219 100644 --- a/os/rpm/openttd.spec +++ b/os/rpm/openttd.spec @@ -17,9 +17,9 @@ # Name: openttd -Version: 1.3.beta2 +Version: 1.5.beta1 Release: 0 -%define srcver 1.3.0-beta2 +%define srcver 1.5.0-beta1 Summary: An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe License: GPL-2.0 Group: Amusements/Games/Strategy/Other diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index e08a0ca833..cca07eade1 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 4 +!define APPV_MINOR 5 !define APPV_MAINT 0 -!define APPV_BUILD 4 -!define APPV_EXTRA "-beta5" +!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 diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in index a03ef81c0f..f70c521fff 100644 --- a/src/os/windows/ottdres.rc.in +++ b/src/os/windows/ottdres.rc.in @@ -79,8 +79,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,4,0,!!REVISION!! - PRODUCTVERSION 1,4,0,!!REVISION!! + FILEVERSION 1,5,0,!!REVISION!! + PRODUCTVERSION 1,5,0,!!REVISION!! FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index d58fbc7ed7..e1daaf4055 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -253,7 +253,7 @@ * 185 25620 * 186 25833 * 187 25899 - * 188 26169 + * 188 26169 1.4.x */ extern const uint16 SAVEGAME_VERSION = 188; ///< Current savegame version of OpenTTD.