Merge branch 'save_ext' into departure-boards

Adjust calls to GenerateVehicleSortList due to API change.

src/table/company_settings.ini

@@ -18,8 +18,8 @@ static const SettingDesc _company_settings[] = {
 [post-amble]
 };
 [templates]
-SDT_BOOL = SDT_BOOL($base, $var,        $flags, $guiflags, $def,                        $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, NULL),
-SDT_VAR  =  SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, NULL),
+SDT_BOOL = SDT_BOOL($base, $var,        $flags, $guiflags, $def,                        $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, $patxname),
+SDT_VAR  =  SDT_VAR($base, $var, $type, $flags, $guiflags, $def, $min, $max, $interval, $str, $strhelp, $strval, $proc, $from, $to, $cat, $extver, $patxname),
 SDT_END  = SDT_END()
 
 [defaults]
@@ -34,7 +34,8 @@ load     = NULL
 from     = 0
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
-extver   = {}
+extver   = SlXvFeatureTest()
+patxname = NULL
 
 
 

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

@@ -331,7 +331,7 @@ static const uint ELRAIL_ELEVATION = 10;
 /** Wires that a draw one level higher than the north corner. */
 static const uint ELRAIL_ELEVRAISE = ELRAIL_ELEVATION + TILE_HEIGHT;
 
-static const SortableSpriteStruct CatenarySpriteData[] = {
+static const SortableSpriteStruct RailCatenarySpriteData[] = {
 /* X direction
 	 * Flat tiles:
 		 * Wires */
@@ -392,14 +392,14 @@ static const SortableSpriteStruct CatenarySpriteData[] = {
 	{ WSO_EW_E,         15,  8,  3,  3,  1, ELRAIL_ELEVATION }  //!33: LOWER trackbit wire, pylon on both ends
 };
 
-static const SortableSpriteStruct CatenarySpriteData_Depot[] = {
+static const SortableSpriteStruct RailCatenarySpriteData_Depot[] = {
 	{ WSO_ENTRANCE_NE,   0,  7, 15,  1,  1, ELRAIL_ELEVATION }, //! Wire for NE depot exit
 	{ WSO_ENTRANCE_SE,   7,  0,  1, 15,  1, ELRAIL_ELEVATION }, //! Wire for SE depot exit
 	{ WSO_ENTRANCE_SW,   0,  7, 15,  1,  1, ELRAIL_ELEVATION }, //! Wire for SW depot exit
 	{ WSO_ENTRANCE_NW,   7,  0,  1, 15,  1, ELRAIL_ELEVATION }  //! Wire for NW depot exit
 };
 
-static const SortableSpriteStruct CatenarySpriteData_Tunnel[] = {
+static const SortableSpriteStruct RailCatenarySpriteData_Tunnel[] = {
 	{ WSO_ENTRANCE_NE,   0,  7, 15,  1,  1, ELRAIL_ELEVATION }, //! Wire for NE tunnel exit
 	{ WSO_ENTRANCE_SE,   7,  0,  1, 15,  1, ELRAIL_ELEVATION }, //! Wire for SE tunnel exit
 	{ WSO_ENTRANCE_SW,   0,  7, 15,  1,  1, ELRAIL_ELEVATION }, //! Wire for SW tunnel exit
@@ -419,7 +419,7 @@ static const SortableSpriteStruct CatenarySpriteData_Tunnel[] = {
  * <li>Position of the Pylon relative to the track</li>
  * <li>Position of the Pylon inside the tile</li></ol>
  */
-enum CatenarySprite {
+enum RailCatenarySprite {
 	WIRE_X_FLAT_SW,
 	WIRE_X_FLAT_NE,
 	WIRE_X_FLAT_BOTH,
@@ -471,7 +471,7 @@ enum CatenarySprite {
  * c) the second
  * d) both
  * PCP exists.*/
-static const CatenarySprite Wires[5][TRACK_END][4] = {
+static const RailCatenarySprite Wires[5][TRACK_END][4] = {
 	{ // Tileh == 0
 		{INVALID_CATENARY, WIRE_X_FLAT_NE,   WIRE_X_FLAT_SW,   WIRE_X_FLAT_BOTH},
 		{INVALID_CATENARY, WIRE_Y_FLAT_SE,   WIRE_Y_FLAT_NW,   WIRE_Y_FLAT_BOTH},

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

@@ -17,7 +17,7 @@
 #define NIP_END() { NULL, 0, 0, 0, 0 }
 
 /* Helper for filling callback tables */
-#define NIC(cb_id, base, variable, bit) { #cb_id, cpp_offsetof(base, variable), cpp_sizeof(base, variable), bit, cb_id }
+#define NIC(cb_id, base, variable, bit) { #cb_id, (ptrdiff_t)cpp_offsetof(base, variable), cpp_sizeof(base, variable), bit, cb_id }
 #define NIC_END() { NULL, 0, 0, 0, 0 }
 
 /* Helper for filling variable 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/townname.h

@@ -11,6 +11,10 @@
 
 #include "../core/enum_type.hpp"
 
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+
 static const char * const _name_original_english_1[] = {
 	"Great ",
 	"Little ",

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