Update to 12.0-beta1

src/rev.cpp.in

@@ -35,7 +35,7 @@ bool IsReleasedVersion()
  *
  * <modified> shows a "M", if the binary is made from modified source code.
  */
-const char _openttd_revision[] = "1.11.2";
+const char _openttd_revision[] = "12.0-beta1";
 
 /**
  * The text version of OpenTTD's build date.
@@ -48,7 +48,7 @@ const char _openttd_build_date[] = __DATE__ " " __TIME__;
 /**
  * The git revision hash of this version.
  */
-const char _openttd_revision_hash[] = "672f285218c6817784d86f737987b75db4bc78fc";
+const char _openttd_revision_hash[] = "b67ef1e5b85cda0af8be0c7d99b8b00b5ec05ebb";
 
 /**
  * The year of this version.
@@ -75,14 +75,17 @@ const byte _openttd_revision_tagged = 1;
 /**
  * The NewGRF revision of OTTD:
  * bits  meaning.
- * 28-31 major version
- * 24-27 minor version
- * 20-23 build
+ * 24-31 major version + 16
+ * 20-23 minor version
  *    19 1 if it is a release, 0 if it is not.
  *  0-18 used to be the SVN revision, now just last revision before switch to git
  *
  * The 19th bit is there so the development/betas/alpha, etc. leading to a
  * final release will always have a lower version number than the released
  * version, thus making comparisons on specific revisions easy.
+ *
+ * The + 16 for the major version is because we went from 1.11.0 to 12.0, dropping
+ * the "patch" part of the version. To make sure "1.11.0" is smaller than "12.0", we
+ * have to adjust the major by 16.
  */
-const uint32 _openttd_newgrf_version = 1 << 28 | 11 << 24 | 2 << 20 | 1 << 19 | 28004;
+const uint32 _openttd_newgrf_version = (12 + 16) << 24 | 0 << 20 | 0 << 19 | 28004;