Change: Heading for 1.10 now (#7319)

7 files changed, 15 insertions, 9 deletions

diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index 43a434546..62ddb2344 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -29,7 +29,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.6") == 0 || strcmp(api_version, "1.7") == 0 ||
-			strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0;
+			strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0 || strcmp(api_version, "1.10") == 0;
 }
 
 #if defined(_WIN32)
diff --git a/src/game/game_info.cpp b/src/game/game_info.cpp
index f8c04608b..0aa316174 100644
--- a/src/game/game_info.cpp
+++ b/src/game/game_info.cpp
@@ -26,7 +26,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.6") == 0 || strcmp(api_version, "1.7") == 0 ||
-			strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0;
+			strcmp(api_version, "1.8") == 0 || strcmp(api_version, "1.9") == 0 || strcmp(api_version, "1.10") == 0;
 }
 
 #if defined(_WIN32)
diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in
index ebf0cc4af..88cf64f66 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,9,0,!!ISODATE!!
- PRODUCTVERSION 1,9,0,!!ISODATE!!
+ FILEVERSION 1,10,0,!!ISODATE!!
+ PRODUCTVERSION 1,10,0,!!ISODATE!!
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index 2d58bb152..2ba406868 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -82,7 +82,7 @@ const byte _openttd_revision_tagged = !!ISTAG!!;
  * 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 | 9 << 24 | 0 << 20 | !!ISSTABLETAG!! << 19 | 28004;
+const uint32 _openttd_newgrf_version = 1 << 28 | 10 << 24 | 0 << 20 | !!ISSTABLETAG!! << 19 | 28004;
 
 #ifdef __MORPHOS__
 /**
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index ad6b76e05..c5e7489c1 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -266,7 +266,7 @@ enum SaveLoadVersion : uint16 {
 	SLV_185,                                ///< 185   25620 Storybooks
 	SLV_186,                                ///< 186   25833 Objects storage
 	SLV_187,                                ///< 187   25899 Linkgraph - restricted flows
-	SLV_188,                                ///< 188   26169 FS#5831 Unify RV travel time
+	SLV_188,                                ///< 188   26169 v1.4  FS#5831 Unify RV travel time
 	SLV_189,                                ///< 189   26450 Heirarchical vehicle subgroups
 
 	SLV_190,                                ///< 190   26547 Separate order travel and wait times
@@ -290,7 +290,7 @@ enum SaveLoadVersion : uint16 {
 
 	SLV_GROUP_LIVERIES,                     ///< 205  PR#7108 Livery storage change and group liveries.
 	SLV_SHIPS_STOP_IN_LOCKS,                ///< 206  PR#7150 Ship/lock movement changes.
-	SLV_FIX_CARGO_MONITOR,                  ///< 207  PR#7175 Cargo monitor data packing fix to support 64 cargotypes.
+	SLV_FIX_CARGO_MONITOR,                  ///< 207  PR#7175 v1.9  Cargo monitor data packing fix to support 64 cargotypes.
 
 	SL_MAX_VERSION,                         ///< Highest possible saveload version
 };
diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp
index 0afe4e08c..f3ec539a4 100644
--- a/src/script/api/ai_changelog.hpp
+++ b/src/script/api/ai_changelog.hpp
@@ -15,9 +15,12 @@
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
  *
+ * \b 1.10.0
+ *
+ * This version is not yet released. The following changes are not set in stone yet.
+ *
  * \b 1.9.0
  *
- * 1.9.0 is not yet released. The following changes are not set in stone yet.
  * API additions:
  * \li AIAirport::GetMonthlyMaintenanceCost
  * \li AIGroup::SetParent
diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp
index 094449d73..1ba254973 100644
--- a/src/script/api/game_changelog.hpp
+++ b/src/script/api/game_changelog.hpp
@@ -15,9 +15,12 @@
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
  *
+ * \b 1.10.0
+ *
+ * This version is not yet released. The following changes are not set in stone yet.
+ *
  * \b 1.9.0
  *
- * 1.9.0 is not yet released. The following changes are not set in stone yet.
  * API additions:
  * \li GSAirport::GetMonthlyMaintenanceCost
  * \li GSClient