From ea4ea628163c735db4c4714966c9bc1c560e0f61 Mon Sep 17 00:00:00 2001
From: Peter Nelson <peter1138@openttd.org>
Date: Mon, 28 Jan 2019 21:54:06 +0000
Subject: Codechange: Make saveload version upper bound exclusive, i.e. version
 object was removed instead of version object last appeared.

---
 src/table/gameopt_settings.ini |  8 +++----
 src/table/settings.ini         | 52 +++++++++++++++++++++---------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'src/table')

diff --git a/src/table/gameopt_settings.ini b/src/table/gameopt_settings.ini
index 3a47c09e3..ef38b15ff 100644
--- a/src/table/gameopt_settings.ini
+++ b/src/table/gameopt_settings.ini
@@ -77,7 +77,7 @@ def      = 0
 min      = 0
 max      = 0
 full     = NULL
-to       = 3
+to       = 4
 
 [SDTG_GENERAL]
 name     = ""diff_custom""
@@ -152,16 +152,16 @@ type     = SLE_UINT8
 def      = DEF_SNOWLINE_HEIGHT * TILE_HEIGHT
 min      = MIN_SNOWLINE_HEIGHT * TILE_HEIGHT
 max      = MAX_SNOWLINE_HEIGHT * TILE_HEIGHT
-to       = 21
+to       = 22
 
 [SDT_NULL]
 length   = 1
 from     = 22
-to       = 164
+to       = 165
 
 [SDT_NULL]
 length   = 1
-to       = 22
+to       = 23
 
 [SDTC_OMANY]
 var      = gui.autosave
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 7afdd8080..0d3109ad5 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -112,7 +112,7 @@ cat      = SC_BASIC
 [SDT_NULL]
 length   = 1
 from     = 97
-to       = 109
+to       = 110
 
 [SDT_VAR]
 base     = GameSettings
@@ -204,7 +204,7 @@ cat      = SC_BASIC
 [SDT_NULL]
 length   = 1
 from     = 97
-to       = 109
+to       = 110
 
 [SDT_VAR]
 base     = GameSettings
@@ -324,7 +324,7 @@ var      = _old_diff_level
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_CONFIG
 from     = 97
-to       = 177
+to       = 178
 def      = 3
 min      = 0
 max      = 3
@@ -362,7 +362,7 @@ cat      = SC_BASIC
 [SDT_NULL]
 length   = 1
 from     = 97
-to       = 163
+to       = 164
 
 [SDT_OMANY]
 base     = GameSettings
@@ -545,7 +545,7 @@ strval   = STR_CONFIG_SETTING_TILE_LENGTH
 # construction.longbridges
 [SDT_NULL]
 length   = 1
-to       = 158
+to       = 159
 
 [SDT_VAR]
 base     = GameSettings
@@ -841,7 +841,7 @@ cat      = SC_BASIC
 ; vehicle.mammoth_trains
 [SDT_NULL]
 length   = 1
-to       = 158
+to       = 159
 
 [SDT_VAR]
 base     = GameSettings
@@ -859,7 +859,7 @@ strval   = STR_CONFIG_SETTING_NONE
 ; order.gotodepot
 [SDT_NULL]
 length   = 1
-to       = 158
+to       = 159
 
 ; path finder
 
@@ -872,7 +872,7 @@ cat      = SC_EXPERT
 [SDT_BOOL]
 base     = GameSettings
 var      = pf.new_pathfinding_all
-to       = 86
+to       = 87
 def      = false
 cat      = SC_EXPERT
 
@@ -880,7 +880,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.ship_use_yapf
 from     = 28
-to       = 86
+to       = 87
 def      = false
 cat      = SC_EXPERT
 
@@ -888,7 +888,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.road_use_yapf
 from     = 28
-to       = 86
+to       = 87
 def      = true
 cat      = SC_EXPERT
 
@@ -896,7 +896,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_use_yapf
 from     = 28
-to       = 86
+to       = 87
 def      = true
 cat      = SC_EXPERT
 
@@ -1012,7 +1012,7 @@ name     = NULL
 guiflags = SGF_NO_NETWORK
 var      = _old_vds.servint_ispercent
 def      = false
-to       = 119
+to       = 120
 
 [SDTG_VAR]
 name     = NULL
@@ -1022,7 +1022,7 @@ var      = _old_vds.servint_trains
 def      = 150
 min      = 5
 max      = 800
-to       = 119
+to       = 120
 
 [SDTG_VAR]
 name     = NULL
@@ -1032,7 +1032,7 @@ var      = _old_vds.servint_roadveh
 def      = 150
 min      = 5
 max      = 800
-to       = 119
+to       = 120
 
 [SDTG_VAR]
 name     = NULL
@@ -1042,7 +1042,7 @@ var      = _old_vds.servint_ships
 def      = 360
 min      = 5
 max      = 800
-to       = 119
+to       = 120
 
 [SDTG_VAR]
 name     = NULL
@@ -1052,7 +1052,7 @@ var      = _old_vds.servint_aircraft
 def      = 150
 min      = 5
 max      = 800
-to       = 119
+to       = 120
 
 [SDT_BOOL]
 base     = GameSettings
@@ -1100,7 +1100,7 @@ proc     = UpdateConsists
 [SDT_NULL]
 length   = 1
 from     = 67
-to       = 158
+to       = 159
 
 [SDT_VAR]
 base     = GameSettings
@@ -1142,12 +1142,12 @@ cat      = SC_BASIC
 ; station.join_stations
 [SDT_NULL]
 length   = 1
-to       = 158
+to       = 159
 
 [SDTC_BOOL]
 var      = gui.sg_full_load_any
 from     = 22
-to       = 92
+to       = 93
 def      = true
 
 [SDT_BOOL]
@@ -1166,13 +1166,13 @@ cat      = SC_EXPERT
 [SDTC_BOOL]
 var      = gui.sg_new_nonstop
 from     = 22
-to       = 92
+to       = 93
 def      = false
 
 ; station.nonuniform_stations
 [SDT_NULL]
 length   = 1
-to       = 158
+to       = 159
 
 [SDT_VAR]
 base     = GameSettings
@@ -1301,7 +1301,7 @@ strhelp  = STR_CONFIG_SETTING_MULTIPINDTOWN_HELPTEXT
 
 [SDT_NULL]
 length   = 1
-to       = 140
+to       = 141
 
 [SDT_BOOL]
 base     = GameSettings
@@ -1366,7 +1366,7 @@ cat      = SC_BASIC
 
 [SDT_NULL]
 length   = 4
-to       = 143
+to       = 144
 
 [SDT_VAR]
 base     = GameSettings
@@ -1382,7 +1382,7 @@ cat      = SC_BASIC
 
 [SDT_NULL]
 length   = 4
-to       = 104
+to       = 105
 
 [SDT_BOOL]
 base     = GameSettings
@@ -1464,7 +1464,7 @@ cat      = SC_EXPERT
 ; previously ai-new setting.
 [SDT_NULL]
 length   = 1
-to       = 106
+to       = 107
 
 [SDT_OMANY]
 base     = GameSettings
@@ -2373,7 +2373,7 @@ name     = ""units""
 var      = _old_units
 type     = SLE_UINT8
 from     = 97
-to       = 183
+to       = 184
 flags    = SLF_NOT_IN_CONFIG
 def      = 1
 max      = 2
-- 
cgit v1.2.3-70-g09d2