summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2017-03-11 20:50:26 +0000
committerfrosch <frosch@openttd.org>2017-03-11 20:50:26 +0000
commitafcef7faa6d3ccfcbf3e46d74c9ae5120d268efc (patch)
tree5d6420a122ecec7b7dbbb395992c82a887804ca5 /src
parentca3aaf8f6dc8093b90b74b252327675be064c03e (diff)
downloadopenttd-afcef7faa6d3ccfcbf3e46d74c9ae5120d268efc.tar.xz
(svn r27780) -Update: Numbers
Diffstat (limited to 'src')
-rw-r--r--src/ai/ai_info.cpp3
-rw-r--r--src/game/game_info.cpp3
-rw-r--r--src/os/windows/ottdres.rc.in4
-rw-r--r--src/rev.cpp.in2
-rw-r--r--src/script/api/ai_changelog.hpp6
-rw-r--r--src/script/api/game_changelog.hpp6
6 files changed, 17 insertions, 7 deletions
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index e862b6246..2afd5d419 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -28,7 +28,8 @@ 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.6") == 0 || strcmp(api_version, "1.7") == 0;
+ strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0 || strcmp(api_version, "1.7") == 0 ||
+ strcmp(api_version, "1.8") == 0;
}
#if defined(WIN32)
diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp
index 39088b846..05443327f 100644
--- a/src/game/game_info.cpp
+++ b/src/game/game_info.cpp
@@ -25,7 +25,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 ||
- strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0 || strcmp(api_version, "1.7") == 0;
+ strcmp(api_version, "1.5") == 0 || strcmp(api_version, "1.6") == 0 || strcmp(api_version, "1.7") == 0 ||
+ strcmp(api_version, "1.8") == 0;
}
#if defined(WIN32)
diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in
index 462da891e..fca129c6a 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,7,0,!!REVISION!!
- PRODUCTVERSION 1,7,0,!!REVISION!!
+ FILEVERSION 1,8,0,!!REVISION!!
+ PRODUCTVERSION 1,8,0,!!REVISION!!
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index 899a565bb..b6bddeacf 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -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 | 7 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 1 << 28 | 8 << 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 23f4a0958..db1c6eb2a 100644
--- a/src/script/api/ai_changelog.hpp
+++ b/src/script/api/ai_changelog.hpp
@@ -15,9 +15,13 @@
* functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut.
*
+ * \b 1.8.0
+ *
+ * 1.8.0 is not yet released. The following changes are not set in stone yet.
+ *
* \b 1.7.0
*
- * 1.7.0 is not yet released. The following changes are not set in stone yet.
+ * No changes
*
* \b 1.6.1 - 1.6.0
*
diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp
index a9e7b0b30..00b953959 100644
--- a/src/script/api/game_changelog.hpp
+++ b/src/script/api/game_changelog.hpp
@@ -15,9 +15,13 @@
* functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut.
*
+ * \b 1.8.0
+ *
+ * 1.8.0 is not yet released. The following changes are not set in stone yet.
+ *
* \b 1.7.0
*
- * 1.7.0 is not yet released. The following changes are not set in stone yet.
+ * No changes
*
* \b 1.6.1 - 1.6.0
*