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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2018-09-20 08:32:56 +01:00
parent 6f9f467dbe 59a1614ba0
commit 6bcc705c7c
15 changed files with 75 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/saveload/saveload.cpp
View File

@@ -277,8 +277,9 @@
* 198
* 199
* 200 #6805 Extend railtypes to 64, adding uint16 to map array.
* 201 #6885 Extend NewGRF persistant storages.
*/
extern const uint16 SAVEGAME_VERSION = 200; ///< Current savegame version of OpenTTD.
extern const uint16 SAVEGAME_VERSION = 201; ///< Current savegame version of OpenTTD.
const uint16 SAVEGAME_VERSION_EXT = 0x8000; ///< Savegame extension indicator mask
SavegameType _savegame_type; ///< type of savegame we are loading