Merge branch 'cpp-11' into save_ext

# Conflicts:
#	findversion.sh
This commit is contained in:
Jonathan G Rennison
2018-04-27 01:33:39 +01:00
119 changed files with 2250 additions and 1094 deletions

View File

@@ -269,7 +269,7 @@
* 194 26881 1.5.x, 1.6.0
* 195 27572 1.6.x
* 196 27778 1.7.x
* 197 27978
* 197 27978 1.8.x
*/
extern const uint16 SAVEGAME_VERSION = 197; ///< Current savegame version of OpenTTD.
const uint16 SAVEGAME_VERSION_EXT = 0x8000; ///< Savegame extension indicator mask