dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into save_ext

Browse Source 
# Conflicts:
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2018-05-25 19:09:20 +01:00
parent 4bcd05a620 e1a164b531
commit fa304cdb75
222 changed files with 2570 additions and 1542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/saveload/saveload.cpp
View File

@@ -270,8 +270,9 @@
* 195 27572 1.6.x
* 196 27778 1.7.x
* 197 27978 1.8.x
* 198
*/
extern const uint16 SAVEGAME_VERSION = 197; ///< Current savegame version of OpenTTD.
extern const uint16 SAVEGAME_VERSION = 198; ///< Current savegame version of OpenTTD.
const uint16 SAVEGAME_VERSION_EXT = 0x8000; ///< Savegame extension indicator mask
SavegameType _savegame_type; ///< type of savegame we are loading