(svn r27192) -Change: heading for 1.6 now

This commit is contained in:
frosch
2015-03-17 20:33:44 +00:00
parent 5b1632f4aa
commit 2edbc72ebd
15 changed files with 41 additions and 17 deletions

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)

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)

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

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

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.

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.5.0 is not yet released. The following changes are not set in stone yet.
* 1.6.0 is not yet released. The following changes are not set in stone yet.
*
* \b 1.5.0
*
* API additions:
* \li AIList::SwapList

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.5.0 is not yet released. The following changes are not set in stone yet.
* 1.6.0 is not yet released. The following changes are not set in stone yet.
*
* \b 1.5.0
*
* API additions:
* \li GSList::SwapList