dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: name a few unnamed settings as to not to have to check for that being empty

Browse Source
This commit is contained in:
Rubidium
2021-07-08 19:12:10 +02:00
committed by rubidium42
parent a70aa5df49
commit 94881f5a34
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/saveload/compat/settings_sl_compat.h
View File

@@ -107,11 +107,11 @@ const SaveLoadCompat _settings_sl_compat[] = {
SLC_VAR("vehicle.max_roadveh"), SLC_VAR("vehicle.max_roadveh"),
SLC_VAR("vehicle.max_aircraft"), SLC_VAR("vehicle.max_aircraft"),
SLC_VAR("vehicle.max_ships"), SLC_VAR("vehicle.max_ships"),
SLC_VAR("_old_vds.servint_ispercent"), SLC_VAR("vehicle.servint_ispercent"),
SLC_VAR("_old_vds.servint_trains"), SLC_VAR("vehicle.servint_trains"),
SLC_VAR("_old_vds.servint_roadveh"), SLC_VAR("vehicle.servint_roadveh"),
SLC_VAR("_old_vds.servint_ships"), SLC_VAR("vehicle.servint_ships"),
SLC_VAR("_old_vds.servint_aircraft"), SLC_VAR("vehicle.servint_aircraft"),
SLC_VAR("order.no_servicing_if_no_breakdowns"), SLC_VAR("order.no_servicing_if_no_breakdowns"),
SLC_VAR("vehicle.wagon_speed_limits"), SLC_VAR("vehicle.wagon_speed_limits"),
SLC_VAR("vehicle.disable_elrails"), SLC_VAR("vehicle.disable_elrails"),

3
src/saveload/settings_sl.cpp
View File

@@ -91,7 +91,8 @@ static std::vector<SaveLoad> GetSettingsDesc(const SettingTable &settings, bool
SaveLoad sv = sd->save; SaveLoad sv = sd->save;
/* Replace the name with the actual name of the setting. */ /* Replace the name with the actual name of the setting. */
if (!sd->name.empty()) sv.name = sd->name; assert(!sd->name.empty());
sv.name = sd->name;
saveloads.push_back(sv); saveloads.push_back(sv);
} }

10
src/table/settings/game_settings.ini
View File

@@ -360,14 +360,14 @@ cat = SC_EXPERT
## Old vehicle settings. ## Old vehicle settings.
[SDTG_BOOL] [SDTG_BOOL]
name = """" name = ""vehicle.servint_ispercent""
flags = SF_NO_NETWORK flags = SF_NO_NETWORK
var = _old_vds.servint_ispercent var = _old_vds.servint_ispercent
def = false def = false
to = SLV_120 to = SLV_120
[SDTG_VAR] [SDTG_VAR]
name = """" name = ""vehicle.servint_trains""
type = SLE_UINT16 type = SLE_UINT16
flags = SF_GUI_0_IS_SPECIAL flags = SF_GUI_0_IS_SPECIAL
var = _old_vds.servint_trains var = _old_vds.servint_trains
@@ -377,7 +377,7 @@ max = 800
to = SLV_120 to = SLV_120
[SDTG_VAR] [SDTG_VAR]
name = """" name = ""vehicle.servint_roadveh""
type = SLE_UINT16 type = SLE_UINT16
flags = SF_GUI_0_IS_SPECIAL flags = SF_GUI_0_IS_SPECIAL
var = _old_vds.servint_roadveh var = _old_vds.servint_roadveh
@@ -387,7 +387,7 @@ max = 800
to = SLV_120 to = SLV_120
[SDTG_VAR] [SDTG_VAR]
name = """" name = ""vehicle.servint_ships""
type = SLE_UINT16 type = SLE_UINT16
flags = SF_GUI_0_IS_SPECIAL flags = SF_GUI_0_IS_SPECIAL
var = _old_vds.servint_ships var = _old_vds.servint_ships
@@ -397,7 +397,7 @@ max = 800
to = SLV_120 to = SLV_120
[SDTG_VAR] [SDTG_VAR]
name = """" name = ""vehicle.servint_aircraft""
type = SLE_UINT16 type = SLE_UINT16
flags = SF_GUI_0_IS_SPECIAL flags = SF_GUI_0_IS_SPECIAL
var = _old_vds.servint_aircraft var = _old_vds.servint_aircraft