From db96a109ff29776e00c6860acdef2d61b81a1f0b Mon Sep 17 00:00:00 2001 From: frosch Date: Mon, 17 Mar 2014 20:02:30 +0000 Subject: (svn r26406) -Change: heading for 1.5 now --- bin/ai/compat_1.4.nut | 2 ++ bin/ai/compat_1.5.nut | 8 ++++++++ bin/game/compat_1.4.nut | 2 ++ bin/game/compat_1.5.nut | 8 ++++++++ src/ai/ai_info.cpp | 4 +++- src/game/game_info.cpp | 3 ++- src/rev.cpp.in | 2 +- src/script/api/ai_changelog.hpp | 4 ++++ src/script/api/game_changelog.hpp | 4 ++++ 9 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 bin/ai/compat_1.5.nut create mode 100644 bin/game/compat_1.5.nut diff --git a/bin/ai/compat_1.4.nut b/bin/ai/compat_1.4.nut index 820a7e5e4..06983f867 100644 --- a/bin/ai/compat_1.4.nut +++ b/bin/ai/compat_1.4.nut @@ -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 . */ + +AILog.Info("1.4 API compatability in effect."); diff --git a/bin/ai/compat_1.5.nut b/bin/ai/compat_1.5.nut new file mode 100644 index 000000000..820a7e5e4 --- /dev/null +++ b/bin/ai/compat_1.5.nut @@ -0,0 +1,8 @@ +/* $Id: compat_1.3.nut 23969 2012-02-19 19:14:17Z rubidium $ */ + +/* + * 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 . + */ diff --git a/bin/game/compat_1.4.nut b/bin/game/compat_1.4.nut index 4703a7c36..b9c5e2013 100644 --- a/bin/game/compat_1.4.nut +++ b/bin/game/compat_1.4.nut @@ -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 . */ + +GSLog.Info("1.4 API compatability in effect."); diff --git a/bin/game/compat_1.5.nut b/bin/game/compat_1.5.nut new file mode 100644 index 000000000..4703a7c36 --- /dev/null +++ b/bin/game/compat_1.5.nut @@ -0,0 +1,8 @@ +/* $Id: compat_1.3.nut 24469 2012-08-13 19:33:17Z yexo $ */ + +/* + * 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 . + */ diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp index 7ea7e3261..375248d7d 100644 --- a/src/ai/ai_info.cpp +++ b/src/ai/ai_info.cpp @@ -23,7 +23,9 @@ */ 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; + 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; } #if defined(WIN32) diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp index 974665ee7..ab49fea12 100644 --- a/src/game/game_info.cpp +++ b/src/game/game_info.cpp @@ -22,7 +22,8 @@ */ 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; + 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; } #if defined(WIN32) diff --git a/src/rev.cpp.in b/src/rev.cpp.in index cd22a4a8c..506e641d7 100644 --- a/src/rev.cpp.in +++ b/src/rev.cpp.in @@ -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 comparisons on specific revisions easy. */ -const uint32 _openttd_newgrf_version = 1 << 28 | 4 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1)); +const uint32 _openttd_newgrf_version = 1 << 28 | 5 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1)); #ifdef __MORPHOS__ /** diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp index e73857dbf..7df7027ab 100644 --- a/src/script/api/ai_changelog.hpp +++ b/src/script/api/ai_changelog.hpp @@ -15,6 +15,10 @@ * functions may still be available if you return an older API version * in GetAPIVersion() in info.nut. * + * \b 1.5.0 + * + * 1.5.0 is not yet released. The following changes are not set in stone yet. + * * \b 1.4.0 * * 1.4.0 is not yet released. The following changes are not set in stone yet. diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp index f6064a1bd..6da64c23b 100644 --- a/src/script/api/game_changelog.hpp +++ b/src/script/api/game_changelog.hpp @@ -15,6 +15,10 @@ * functions may still be available if you return an older API version * in GetAPIVersion() in info.nut. * + * \b 1.5.0 + * + * 1.5.0 is not yet released. The following changes are not set in stone yet. + * * \b 1.4.0 * * 1.4.0 is not yet released. The following changes are not set in stone yet. -- cgit v1.2.3-54-g00ecf