Merge branch 'save_ext' into signal_tunnels_bridges-sx

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/newgrf_debug_data.h

@@ -13,7 +13,7 @@
 #include "../newgrf_engine.h"
 
 /* Helper for filling property tables */
-#define NIP(prop, base, variable, type, name) { name, cpp_offsetof(base, variable), cpp_sizeof(base, variable), prop, type }
+#define NIP(prop, base, variable, type, name) { name, (ptrdiff_t)cpp_offsetof(base, variable), cpp_sizeof(base, variable), prop, type }
 #define NIP_END() { NULL, 0, 0, 0, 0 }
 
 /* Helper for filling callback tables */

src/table/settings.ini

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

src/table/string_colours.h

@@ -9,23 +9,23 @@
 
 /** @file string_colours.h The colour translation of GRF's strings. */
 
-/** Colour mapping for the TextColours. */
+/** Colour mapping for #TextColour. */
 static const byte _string_colourmap[17] = {
-		150, // TC_BLUE
-		 12, // TC_SILVER
-		189, // TC_GOLD
-		184, // TC_RED
-		174, // TC_PURPLE
-		 30, // TC_LIGHT_BROWN
-		195, // TC_ORANGE
-		209, // TC_GREEN
-		 68, // TC_YELLOW
-		 95, // TC_DARK_GREEN
-		 79, // TC_CREAM
-		116, // TC_BROWN
-		 15, // TC_WHITE
-		152, // TC_LIGHT_BLUE
-		  6, // TC_GREY
-		133, // TC_DARK_BLUE
-		  1, // TC_BLACK
+	150, // TC_BLUE
+	 12, // TC_SILVER
+	189, // TC_GOLD
+	184, // TC_RED
+	174, // TC_PURPLE
+	 30, // TC_LIGHT_BROWN
+	195, // TC_ORANGE
+	209, // TC_GREEN
+	 68, // TC_YELLOW
+	 95, // TC_DARK_GREEN
+	 79, // TC_CREAM
+	116, // TC_BROWN
+	 15, // TC_WHITE
+	152, // TC_LIGHT_BLUE
+	  6, // TC_GREY
+	133, // TC_DARK_BLUE
+	  1, // TC_BLACK
 };

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()