Merge branch 'jgrpp' into save_ext_spp

src/table/company_settings.ini

@@ -34,7 +34,7 @@ load     = NULL
 from     = 0
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
-extver   = {}
+extver   = SlXvFeatureTest()
 
 
 

src/table/currency_settings.ini

@@ -28,7 +28,7 @@ load     = NULL
 from     = 0
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
-extver   = {}
+extver   = SlXvFeatureTest()
 
 
 

src/table/gameopt_settings.ini

@@ -62,7 +62,7 @@ load     = NULL
 from     = 0
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
-extver   = {}
+extver   = SlXvFeatureTest()
 
 
 

src/table/misc_settings.ini

@@ -35,7 +35,7 @@ load     = NULL
 from     = 0
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
-extver   = {}
+extver   = SlXvFeatureTest()
 
 
 

src/table/settings.ini

@@ -96,7 +96,7 @@ load     = NULL
 from     = 0
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
-extver   = {}
+extver   = SlXvFeatureTest()
 patxname = NULL
 xref     = <this parameter must be set>
 

src/table/sprites.h

@@ -318,8 +318,12 @@ static const SpriteID SPR_ZONING_INNER_HIGHLIGHT_LIGHT_BLUE = SPR_ZONING_INNER_H
 static const SpriteID SPR_ZONING_INNER_HIGHLIGHT_ORANGE     = SPR_ZONING_INNER_HIGHLIGHT_BASE + 23;
 static const SpriteID SPR_ZONING_INNER_HIGHLIGHT_WHITE      = SPR_ZONING_INNER_HIGHLIGHT_BASE + 24;
 
+/* Tracerestrict sprites */
+static const SpriteID SPR_TRACERESTRICT_BASE = SPR_ZONING_INNER_HIGHLIGHT_BASE + ZONING_INNER_HIGHLIGHT_SPRITE_COUNT;
+static const uint16 TRACERESTRICT_SPRITE_COUNT = 2;
+
 /* From where can we start putting NewGRFs? */
-static const SpriteID SPR_NEWGRFS_BASE = SPR_ZONING_INNER_HIGHLIGHT_BASE + ZONING_INNER_HIGHLIGHT_SPRITE_COUNT;
+static const SpriteID SPR_NEWGRFS_BASE = SPR_TRACERESTRICT_BASE + TRACERESTRICT_SPRITE_COUNT;
 
 /* Manager face sprites */
 static const SpriteID SPR_GRADIENT = 874; // background gradient behind manager face

src/table/win32_settings.ini

@@ -33,7 +33,7 @@ load     = NULL
 from     = 0
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
-extver   = {}
+extver   = SlXvFeatureTest()
 
 
 

src/table/window_settings.ini

@@ -29,7 +29,7 @@ load     = NULL
 from     = 0
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
-extver   = {}
+extver   = SlXvFeatureTest()