Merge branch 'master' into jgrpp-beta

# Conflicts: # src/saveload/cargopacket_sl.cpp # src/saveload/cheat_sl.cpp # src/saveload/company_sl.cpp # src/saveload/engine_sl.cpp # src/saveload/map_sl.cpp # src/saveload/order_sl.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/saveload/station_sl.cpp # src/saveload/vehicle_sl.cpp # src/settings.cpp # src/settings_gui.cpp # src/settings_internal.h # src/stdafx.h # src/table/settings/settings.ini # src/town_cmd.cpp # src/vehicle.cpp
2021-10-25 18:10:15 +01:00
parent 544da99102 7572603c9d
commit ffef1c9e44
81 changed files with 705 additions and 649 deletions
--- a/src/table/settings.h.preamble
+++ b/src/table/settings.h.preamble
@@ -85,7 +85,7 @@ static size_t ConvertLandscape(const char *value);
 	NSD(Int, SLE_GENERAL_X(SL_VAR, base, var, type | flags, 1, from, to, extver), #var, guiflags, guiproc, startup, patxname, def, min, max, interval, str, strhelp, strval, cat, pre_check, post_callback, nullptr)

 #define SDT_ENUM(base, var, type, flags, guiflags, def, str, strhelp, pre_check, post_callback, from, to, extver, cat, guiproc, startup, patxname, enumlist)\
-	NSD(Int, SLE_GENERAL_X(SL_VAR, base, var, type | flags, 1, from, to, extver), #var, guiflags | SGF_ENUM, guiproc, startup, patxname, def, 0, 0, 0, str, strhelp, STR_NULL, cat, pre_check, post_callback, enumlist)
+	NSD(Int, SLE_GENERAL_X(SL_VAR, base, var, type | flags, 1, from, to, extver), #var, guiflags | SF_ENUM, guiproc, startup, patxname, def, 0, 0, 0, str, strhelp, STR_NULL, cat, pre_check, post_callback, enumlist)

 #define SDT_BOOL(base, var, flags, guiflags, def, str, strhelp, strval, pre_check, post_callback, from, to, extver, cat, guiproc, startup, patxname)\
 	NSD(Bool, SLE_GENERAL_X(SL_VAR, base, var, SLE_BOOL | flags, 1, from, to, extver), #var, guiflags, guiproc, startup, patxname, def, str, strhelp, strval, cat, pre_check, post_callback)
--- a/src/table/settings/company_settings.ini
+++ b/src/table/settings/company_settings.ini
@@ -25,7 +25,7 @@ SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for CompanySettings.$v

 [defaults]
 flags    = 0
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
@@ -53,7 +53,7 @@ cat      = SC_BASIC
 [SDT_VAR]
 var      = engine_renew_months
 type     = SLE_INT16
-guiflags = SGF_PER_COMPANY | SGF_DISPLAY_ABS
+guiflags = SF_PER_COMPANY | SF_GUI_NEGATIVE_IS_SPECIAL
 def      = 6
 min      = -12
 max      = 12
@@ -64,7 +64,7 @@ strval   = STR_CONFIG_SETTING_AUTORENEW_MONTHS_VALUE_BEFORE
 [SDT_VAR]
 var      = engine_renew_money
 type     = SLE_UINT
-guiflags = SGF_PER_COMPANY | SGF_CURRENCY
+guiflags = SF_PER_COMPANY | SF_GUI_CURRENCY
 def      = 100000
 min      = 0
 max      = 2000000
@@ -91,7 +91,7 @@ post_cb  = UpdateServiceInterval
 [SDT_VAR]
 var      = vehicle.servint_trains
 type     = SLE_UINT16
-guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
+guiflags = SF_PER_COMPANY | SF_GUI_0_IS_SPECIAL
 def      = 150
 min      = 5
 max      = 800
@@ -104,7 +104,7 @@ post_cb  = [](auto new_value) { UpdateServiceInterval(VEH_TRAIN, new_value); }
 [SDT_VAR]
 var      = vehicle.servint_roadveh
 type     = SLE_UINT16
-guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
+guiflags = SF_PER_COMPANY | SF_GUI_0_IS_SPECIAL
 def      = 150
 min      = 5
 max      = 800
@@ -117,7 +117,7 @@ post_cb  = [](auto new_value) { UpdateServiceInterval(VEH_ROAD, new_value); }
 [SDT_VAR]
 var      = vehicle.servint_ships
 type     = SLE_UINT16
-guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
+guiflags = SF_PER_COMPANY | SF_GUI_0_IS_SPECIAL
 def      = 360
 min      = 5
 max      = 800
@@ -130,7 +130,7 @@ post_cb  = [](auto new_value) { UpdateServiceInterval(VEH_SHIP, new_value); }
 [SDT_VAR]
 var      = vehicle.servint_aircraft
 type     = SLE_UINT16
-guiflags = SGF_PER_COMPANY | SGF_0ISDISABLED
+guiflags = SF_PER_COMPANY | SF_GUI_0_IS_SPECIAL
 def      = 100
 min      = 5
 max      = 800
@@ -143,7 +143,7 @@ post_cb  = [](auto new_value) { UpdateServiceInterval(VEH_AIRCRAFT, new_value);
 [SDT_BOOL]
 base     = CompanySettings
 var      = vehicle.auto_timetable_by_default
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 def      = false
 str      = STR_CONFIG_SETTING_AUTO_TIMETABLE_BY_DEFAULT
 strhelp  = STR_CONFIG_SETTING_AUTO_TIMETABLE_BY_DEFAULT_HELPTEXT
@@ -152,7 +152,7 @@ patxname = ""vehicle.auto_timetable_by_default""
 [SDT_BOOL]
 base     = CompanySettings
 var      = vehicle.auto_separation_by_default
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 def      = true
 str      = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_BY_DEFAULT
 strhelp  = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_BY_DEFAULT_HELPTEXT
@@ -162,7 +162,7 @@ patxname = ""vehicle.auto_separation_by_default""
 base     = CompanySettings
 var      = auto_timetable_separation_rate
 type     = SLE_UINT8
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 def      = 40
 min      = 0
 max      = 100
@@ -177,7 +177,7 @@ patxname = ""auto_timetable_separation_rate""
 base     = CompanySettings
 var      = timetable_autofill_rounding
 type     = SLE_UINT16
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 def      = 74
 min      = 1
 max      = 1000
@@ -192,7 +192,7 @@ patxname = ""timetable_autofill_rounding""
 base     = CompanySettings
 var      = order_occupancy_smoothness
 type     = SLE_UINT8
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 def      = 75
 min      = 0
 max      = 100
@@ -206,7 +206,7 @@ patxname = ""order_occupancy_smoothness""
 [SDT_BOOL]
 base     = CompanySettings
 var      = infra_others_buy_in_depot[0]
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 def      = false
 str      = STR_CONFIG_SETTING_INFRA_OTHERS_BUY_IN_DEPOT_RAIL
 patxname = ""infra_sharing.infra_others_buy_in_depot.rail""
@@ -214,7 +214,7 @@ patxname = ""infra_sharing.infra_others_buy_in_depot.rail""
 [SDT_BOOL]
 base     = CompanySettings
 var      = infra_others_buy_in_depot[1]
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 def      = false
 str      = STR_CONFIG_SETTING_INFRA_OTHERS_BUY_IN_DEPOT_ROAD
 patxname = ""infra_sharing.infra_others_buy_in_depot.road""
@@ -222,7 +222,7 @@ patxname = ""infra_sharing.infra_others_buy_in_depot.road""
 [SDT_BOOL]
 base     = CompanySettings
 var      = infra_others_buy_in_depot[2]
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 def      = false
 str      = STR_CONFIG_SETTING_INFRA_OTHERS_BUY_IN_DEPOT_WATER
 patxname = ""infra_sharing.infra_others_buy_in_depot.water""
@@ -230,7 +230,7 @@ patxname = ""infra_sharing.infra_others_buy_in_depot.water""
 [SDT_BOOL]
 base     = CompanySettings
 var      = infra_others_buy_in_depot[3]
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 def      = false
 str      = STR_CONFIG_SETTING_INFRA_OTHERS_BUY_IN_DEPOT_AIR
 patxname = ""infra_sharing.infra_others_buy_in_depot.air""
@@ -239,7 +239,7 @@ patxname = ""infra_sharing.infra_others_buy_in_depot.air""
 [SDT_BOOL]
 base     = CompanySettings
 var      = advance_order_on_clone
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 def      = false
 str      = STR_CONFIG_SETTING_ADVANCE_ORDER_ON_CLONE
 strhelp  = STR_CONFIG_SETTING_ADVANCE_ORDER_ON_CLONE_HELPTEXT
@@ -248,7 +248,7 @@ patxname = ""advance_order_on_clone""
 [SDT_BOOL]
 base     = CompanySettings
 var      = copy_clone_add_to_group
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 def      = true
 str      = STR_CONFIG_SETTING_COPY_CLONE_ADD_TO_GROUP
 strhelp  = STR_CONFIG_SETTING_COPY_CLONE_ADD_TO_GROUP_HELPTEXT
@@ -258,7 +258,7 @@ patxname = ""copy_clone_add_to_group""
 base     = CompanySettings
 var      = simulated_wormhole_signals
 type     = SLE_UINT8
-guiflags = SGF_PER_COMPANY
+guiflags = SF_PER_COMPANY
 def      = 4
 min      = 1
 max      = 16
--- a/src/table/settings/currency_settings.ini
+++ b/src/table/settings/currency_settings.ini
@@ -19,7 +19,7 @@ SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for CurrencySpec.$var

 [defaults]
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NONE
+guiflags = SF_NONE
 interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
--- a/src/table/settings/gameopt_settings.ini
+++ b/src/table/settings/gameopt_settings.ini
@@ -64,7 +64,7 @@ SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for GameSettings.$var

 [defaults]
 flags    = 0
-guiflags = SGF_NONE
+guiflags = SF_NONE
 interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
--- a/src/table/settings/misc_settings.ini
+++ b/src/table/settings/misc_settings.ini
@@ -38,7 +38,7 @@ SDTG_OMANY = static_assert($max <= MAX_$type, "Maximum value for $var exceeds st

 [defaults]
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NONE
+guiflags = SF_NONE
 interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
--- a/src/table/settings/settings.ini
+++ b/src/table/settings/settings.ini
--- a/src/table/settings/win32_settings.ini
+++ b/src/table/settings/win32_settings.ini
@@ -25,7 +25,7 @@ SDTG_VAR = static_assert($max <= MAX_$type, "Maximum value for $var exceeds stor

 [defaults]
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NONE
+guiflags = SF_NONE
 interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
--- a/src/table/settings/window_settings.ini
+++ b/src/table/settings/window_settings.ini
@@ -21,7 +21,7 @@ SDT_VAR = static_assert($max <= MAX_$type, "Maximum value for WindowDesc.$var ex

 [defaults]
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-guiflags = SGF_NONE
+guiflags = SF_NONE
 interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT