cpp/openttd-patchpack/source Changeset - r21316:52334f119e4d

Changeset - r21316:52334f119e4d

Parent rev.

Child rev.

[Not reviewed]

master

0 7 2

frosch - 10 years ago 2014-03-17 20:02:30
frosch@openttd.org

(svn r26406) -Change: heading for 1.5 now

9 files changed with 34 insertions and 3 deletions:

bin/ai/compat_1.4.nut

bin/ai/compat_1.5.nut

bin/game/compat_1.4.nut

bin/game/compat_1.5.nut

src/ai/ai_info.cpp

src/game/game_info.cpp

src/rev.cpp.in

src/script/api/ai_changelog.hpp

src/script/api/game_changelog.hpp

0 comments (0 inline, 0 general)

bin/ai/compat_1.4.nut

➞

Show inline comments

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

bin/ai/compat_1.5.nut

➞

Show inline comments

@@ new file 100644 @@
 /* $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 <http://www.gnu.org/licenses/>.
  */

bin/game/compat_1.4.nut

➞

Show inline comments

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

bin/game/compat_1.5.nut

➞

Show inline comments

@@ new file 100644 @@
 /* $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 <http://www.gnu.org/licenses/>.
  */

src/ai/ai_info.cpp

➞

Show inline comments

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

src/game/game_info.cpp

➞

Show inline comments

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

src/rev.cpp.in

➞

Show inline comments

@@ @@ -70,7 +70,7 @@ const byte _openttd_revision_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__
 /**

src/script/api/ai_changelog.hpp

➞

Show inline comments

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

src/script/api/game_changelog.hpp

➞

Show inline comments

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

0 comments (0 inline, 0 general)