Merge branch 'save_ext_spp' into jgrpp

2015-08-31 10:22:39 +01:00
parent 9287fa6554 44a41ba13e
commit ce15bdc08f
16 changed files with 466 additions and 25 deletions
--- a/src/table/company_settings.ini
+++ b/src/table/company_settings.ini
@@ -20,6 +20,7 @@ static const SettingDesc _company_settings[] = {
 [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_NULL =  SDT_NULL($length, $from, $to, $extver),
 SDT_END  = SDT_END()

 [defaults]
@@ -74,6 +75,11 @@ base     = CompanySettings
 var      = renew_keep_length
 def      = false

+;; allow_autoreplace_to_self
+[SDT_NULL]
+length   = 1
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP, 2)
+
 [SDT_BOOL]
 base     = CompanySettings
 var      = vehicle.servint_ispercent
--- a/src/table/settings.h.preamble
+++ b/src/table/settings.h.preamble
@@ -62,7 +62,7 @@ static size_t ConvertLandscape(const char *value);
 /* Macros for various objects to go in the configuration file.
 * This section is for global variables */
 #define SDTG_GENERAL(name, sdt_cmd, sle_cmd, type, flags, guiflags, var, length, def, min, max, interval, full, str, strhelp, strval, proc, from, to, cat, extver, patxname)\
-	{NSD_GENERAL(name, def, sdt_cmd, guiflags, min, max, interval, full, str, strhelp, strval, proc, NULL, cat), SLEG_GENERAL_X(sle_cmd, var, type | flags, length, from, to, extver), patxname}
+	{NSD_GENERAL(name, def, sdt_cmd, guiflags, min, max, interval, full, str, strhelp, strval, proc, NULL, cat), SLEG_GENERAL_X(sle_cmd, var, type | flags, length, from, to, extver), patxname, NULL}

 #define SDTG_VAR(name, type, flags, guiflags, var, def, min, max, interval, str, strhelp, strval, proc, from, to, cat, extver, patxname)\
 	SDTG_GENERAL(name, SDT_NUMX, SL_VAR, type, flags, guiflags, var, 0, def, min, max, interval, NULL, str, strhelp, strval, proc, from, to, cat, extver, patxname)
@@ -83,14 +83,14 @@ static size_t ConvertLandscape(const char *value);
 	SDTG_GENERAL(name, SDT_MANYOFMANY, SL_VAR, type, flags, guiflags, var, 0, def, 0, 0, 0, full, str, strhelp, strval, proc, from, to, cat, extver, patxname)

 #define SDTG_NULL(length, from, to, extver)\
-	{{"", NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLEG_NULL_X(length, from, to, extver), NULL}
+	{{"", NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLEG_NULL_X(length, from, to, extver), NULL, NULL}

-#define SDTG_END() {{NULL, NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLEG_END(), NULL}
+#define SDTG_END() {{NULL, NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLEG_END(), NULL, NULL}

 /* Macros for various objects to go in the configuration file.
 * This section is for structures where their various members are saved */
 #define SDT_GENERAL(name, sdt_cmd, sle_cmd, type, flags, guiflags, base, var, length, def, min, max, interval, full, str, strhelp, strval, proc, load, from, to, cat, extver, patxname)\
-	{NSD_GENERAL(name, def, sdt_cmd, guiflags, min, max, interval, full, str, strhelp, strval, proc, load, cat), SLE_GENERAL_X(sle_cmd, base, var, type | flags, length, from, to, extver), patxname}
+	{NSD_GENERAL(name, def, sdt_cmd, guiflags, min, max, interval, full, str, strhelp, strval, proc, load, cat), SLE_GENERAL_X(sle_cmd, base, var, type | flags, length, from, to, extver), patxname, NULL}

 #define SDT_VAR(base, var, type, flags, guiflags, def, min, max, interval, str, strhelp, strval, proc, from, to, cat, extver, patxname)\
 	SDT_GENERAL(#var, SDT_NUMX, SL_VAR, type, flags, guiflags, base, var, 1, def, min, max, interval, NULL, str, strhelp, strval, proc, NULL, from, to, cat, extver, patxname)
@@ -114,7 +114,7 @@ static size_t ConvertLandscape(const char *value);
 	SDT_GENERAL(#var, SDT_MANYOFMANY, SL_VAR, type, flags, guiflags, base, var, 1, def, 0, 0, 0, full, str, strhelp, strval, proc, NULL, from, to, cat, extver, patxname)

 #define SDT_NULL(length, from, to, extver)\
-	{{"", NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLE_CONDNULL_X(length, from, to, extver), NULL}
+	{{"", NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLE_CONDNULL_X(length, from, to, extver), NULL, NULL}


 #define SDTC_VAR(var, type, flags, guiflags, def, min, max, interval, str, strhelp, strval, proc, from, to, cat, extver, patxname)\
@@ -132,5 +132,8 @@ static size_t ConvertLandscape(const char *value);
 #define SDTC_OMANY(var, type, flags, guiflags, def, max, full, str, strhelp, strval, proc, from, to, cat, extver, patxname)\
 	SDTG_GENERAL(#var, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, _settings_client.var, 1, def, 0, max, 0, full, str, strhelp, strval, proc, from, to, cat, extver, patxname)

-#define SDT_END() {{NULL, NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLE_END(), NULL}
+#define SDT_XREF(from, to, extver, xref)\
+	{{"", NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLE_CONDNULL_X(0, from, to, extver), NULL, xref}
+
+#define SDT_END() {{NULL, NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLE_END(), NULL, NULL}

--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -81,6 +81,7 @@ SDT_OMANY  =  SDT_OMANY($base, $var, $type, $flags, $guiflags, $def,
 SDT_STR    =    SDT_STR($base, $var, $type, $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_NULL   =   SDT_NULL($length, $from, $to, $extver),
+SDT_XREF     = SDT_XREF(         $from, $to, $extver, $xref),
 SDT_END    = SDT_END()

 [defaults]
@@ -97,6 +98,7 @@ to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
 extver   = SlXvFeatureTest()
 patxname = NULL
+xref     = <this parameter must be set>



@@ -335,6 +337,14 @@ min      = 0
 max      = 3
 cat      = SC_BASIC

+[SDT_XREF]
+xref     = ""order.timetable_automated""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+[SDT_XREF]
+xref     = ""order.timetable_separation""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 [SDT_BOOL]
 base     = GameSettings
 var      = order.timetable_automated
@@ -435,6 +445,7 @@ strhelp  = STR_CONFIG_SETTING_MAX_HEIGHTLEVEL_HELPTEXT
 strval   = STR_JUST_INT
 proc     = ChangeMaxHeightLevel
 cat      = SC_BASIC
+extver   = SlXvFeatureTest(XSLFTO_OR, XSLFI_HEIGHT_8_BIT)

 [SDT_BOOL]
 base     = GameSettings
@@ -562,6 +573,10 @@ str      = STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH
 strhelp  = STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT
 strval   = STR_CONFIG_SETTING_TILE_LENGTH

+[SDT_XREF]
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP, 2)
+xref     = ""construction.simulated_wormhole_signals""
+
 [SDT_VAR]
 base     = GameSettings
 var      = construction.max_bridge_height
@@ -606,7 +621,11 @@ from     = 0
 cat      = SC_BASIC
 patxname = ""signal_tunnel_bridge.construction.simulated_wormhole_signals""

-# construction.longbridges
+[SDT_XREF]
+xref     = ""construction.maximum_signal_evaluations""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+;; construction.longbridges
 [SDT_NULL]
 length   = 1
 to       = 158
@@ -648,6 +667,16 @@ strhelp  = STR_CONFIG_SETTING_TOWN_LAYOUT_HELPTEXT
 strval   = STR_CONFIG_SETTING_TOWN_LAYOUT_DEFAULT
 proc     = TownFoundingChanged

+;; economy.town_construction_cost
+[SDT_NULL]
+length   = 1
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+;; economy.station_rating_type
+[SDT_NULL]
+length   = 1
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 [SDT_BOOL]
 base     = GameSettings
 var      = economy.allow_town_roads
@@ -657,6 +686,10 @@ def      = true
 str      = STR_CONFIG_SETTING_ALLOW_TOWN_ROADS
 strhelp  = STR_CONFIG_SETTING_ALLOW_TOWN_ROADS_HELPTEXT

+[SDT_XREF]
+xref     = ""economy.town_cargo_factor""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 [SDT_VAR]
 base     = GameSettings
 var      = economy.found_town
@@ -1030,6 +1063,11 @@ def      = false
 str      = STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES
 strhelp  = STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES_HELPTEXT

+;; vehicle.exact_intro_date
+[SDT_NULL]
+length   = 1
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 [SDT_VAR]
 base     = GameSettings
 var      = vehicle.max_trains
@@ -1171,6 +1209,11 @@ strhelp  = STR_CONFIG_SETTING_FREIGHT_TRAINS_HELPTEXT
 strval   = STR_JUST_COMMA
 proc     = UpdateConsists

+;; vehicle.freight_mult_to_passengers
+[SDT_NULL]
+length   = 1
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 ; order.timetabling
 [SDT_NULL]
 length   = 1
@@ -1214,6 +1257,10 @@ strhelp  = STR_CONFIG_SETTING_PLANE_CRASHES_HELPTEXT
 strval   = STR_CONFIG_SETTING_PLANE_CRASHES_NONE
 cat      = SC_BASIC

+[SDT_XREF]
+xref     = ""vehicle.improved_breakdowns""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 [SDT_BOOL]
 base     = GameSettings
 var      = vehicle.improved_breakdowns
@@ -1246,6 +1293,12 @@ var      = order.selectgoods
 def      = true
 cat      = SC_EXPERT

+;; economy.deliver_goods
+;; vehicle.cargo_wait_time
+[SDT_NULL]
+length   = 2
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 [SDTC_BOOL]
 var      = gui.sg_new_nonstop
 from     = 22
@@ -1339,6 +1392,16 @@ str      = STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS
 strhelp  = STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS_HELPTEXT
 proc     = DeleteSelectStationWindow

+;; construction.traffic_lights
+;; construction.towns_build_traffic_lights
+;; construction.allow_building_tls_in_towns
+;; construction.traffic_lights_green_phase
+;; construction.max_tlc_size
+;; construction.max_tlc_distance
+[SDT_NULL]
+length   = 6
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 ##
 [SDT_BOOL]
 base     = GameSettings
@@ -1396,10 +1459,22 @@ def      = false
 str      = STR_CONFIG_SETTING_MULTIPINDTOWN
 strhelp  = STR_CONFIG_SETTING_MULTIPINDTOWN_HELPTEXT

+;; economy.allow_automatic_industries
+[SDT_NULL]
+length   = 1
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP, 3)
+
 [SDT_NULL]
 length   = 1
 to       = 140

+;; economy.minimum_distance_town
+;; economy.minimum_distance_industry
+;; economy.minimum_distance_ind_town
+[SDT_NULL]
+length   = 6
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 [SDT_BOOL]
 base     = GameSettings
 var      = economy.bribe
@@ -1511,6 +1586,59 @@ strhelp  = STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT
 strval   = STR_CONFIG_SETTING_PERCENTAGE
 cat      = SC_EXPERT

+[SDT_XREF]
+xref     = ""economy.day_length_factor""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+;; economy.price_mult[0-70]
+[SDT_NULL]
+length   = 71
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+;; economy.price_rails[0-15]
+[SDT_NULL]
+length   = 16
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+;; economy.rail_maintenance[0-15]
+[SDT_NULL]
+length   = 16
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+; note that this has changed format in SpringPP 2.1.147
+[SDT_XREF]
+xref     = ""vehicle.pay_for_repair""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+[SDT_XREF]
+xref     = ""vehicle.repair_cost""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+;; economy.town_consumption_rate
+[SDT_NULL]
+length   = 1
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+;; economy.town_pop_*
+[SDT_NULL]
+length   = 6
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+;; economy.town_consumption_rates[0-2][0-2]
+[SDT_NULL]
+length   = 18
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+;; economy.town_effects[0-2]
+[SDT_NULL]
+length   = 3
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+;; economy.grow_if_one_delivered
+[SDT_NULL]
+length   = 1
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 [SDT_VAR]
 base     = GameSettings
 var      = economy.town_growth_rate
@@ -1558,6 +1686,43 @@ from     = 77
 def      = true
 cat      = SC_EXPERT

+
+[SDT_XREF]
+xref     = ""economy.infrastructure_sharing[0]""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+[SDT_XREF]
+xref     = ""economy.infrastructure_sharing[1]""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+[SDT_XREF]
+xref     = ""economy.infrastructure_sharing[2]""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+[SDT_XREF]
+xref     = ""economy.infrastructure_sharing[3]""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+[SDT_XREF]
+xref     = ""economy.sharing_fee[0]""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+[SDT_XREF]
+xref     = ""economy.sharing_fee[1]""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+[SDT_XREF]
+xref     = ""economy.sharing_fee[2]""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+[SDT_XREF]
+xref     = ""economy.sharing_fee[3]""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
+[SDT_XREF]
+xref     = ""economy.sharing_payment_in_debt""
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 [SDT_VAR]
 base     = GameSettings
 var      = construction.maximum_signal_evaluations
@@ -2015,6 +2180,11 @@ min      = 0
 max      = 100000
 cat      = SC_EXPERT

+# pf.npf.npf_road_trafficlight_penalty
+[SDT_NULL]
+length   = 4
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 [SDT_VAR]
 base     = GameSettings
 var      = pf.npf.npf_road_dt_occupied_penalty
@@ -2320,6 +2490,11 @@ min      = 0
 max      = 1000000
 cat      = SC_EXPERT

+# pf.yapf.road_trafficlight_penalty
+[SDT_NULL]
+length   = 4
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
+
 [SDT_VAR]
 base     = GameSettings
 var      = pf.yapf.road_stop_penalty