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/base_station_base.h
#	src/newgrf.cpp
#	src/newgrf_class.h
#	src/newgrf_class_func.h
#	src/newgrf_commons.cpp
#	src/newgrf_commons.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_station.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
This commit is contained in:
Jonathan G Rennison
2023-06-03 11:01:44 +01:00
parent fc80a93672 0b72297d57
commit 36fadb5424
10 changed files with 66 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/saveload/saveload_common.h
View File

@@ -363,6 +363,7 @@ enum SaveLoadVersion : uint16 {
SLV_AI_START_DATE, ///< 309 PR#10653 Removal of individual AI start dates and added a generic one.
SLV_EXTEND_VEHICLE_RANDOM, ///< 310 PR#10701 Extend vehicle random bits.
SLV_EXTEND_ENTITY_MAPPING, ///< 311 PR#10672 Extend entity mapping range.
SL_MAX_VERSION, ///< Highest possible saveload version