(svn r22083) -Change: trunk is heading towards 1.2 now

src/ai/ai_info.cpp

@@ -57,7 +57,7 @@ AILibrary::~AILibrary()
  */
 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;
+	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;
 }
 
 /* static */ SQInteger AIInfo::Constructor(HSQUIRRELVM vm)

src/ai/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.2.0
+ *
+ * 1.2.0 is not yet released. The following changes are not set in stone yet.
+ *
  * \b 1.1.0
  *
  * 1.1.0 is not yet released. The following changes are not set in stone yet.

src/ai/api/ai_info_docs.hpp

@@ -150,6 +150,7 @@ public:
 	 * - "0.7"
 	 * - "1.0"
 	 * - "1.1"
+	 * - "1.2"
 	 *
 	 * @return The version this AI is compatible with.
 	 * @note This function is optional.

src/os/windows/ottdres.rc.in

@@ -79,8 +79,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,0,!!REVISION!!
- PRODUCTVERSION 1,1,0,!!REVISION!!
+ FILEVERSION 1,2,0,!!REVISION!!
+ PRODUCTVERSION 1,2,0,!!REVISION!!
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

src/rev.cpp.in

@@ -60,7 +60,7 @@ const byte _openttd_revision_modified = !!MODIFIED!!;
  * final release will always have a lower version number than the released
  * version, thus making comparisions on specific revisions easy.
  */
-const uint32 _openttd_newgrf_version = 1 << 28 | 1 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 1 << 28 | 2 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
 
 #ifdef __MORPHOS__
 /**