summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsmatz <smatz@openttd.org>2009-02-16 21:43:44 +0000
committersmatz <smatz@openttd.org>2009-02-16 21:43:44 +0000
commitb9b14bd803cd827b7ece4e3e63bb10472badeecb (patch)
treeea16bdce9f4760e716818fdabfce075d35fde2f8
parent2f767e77e86d9dabae12786c98901fd01bedd853 (diff)
downloadopenttd-b9b14bd803cd827b7ece4e3e63bb10472badeecb.tar.xz
(svn r15500) -Fix (r12648): pre-0.5 OTTD stored new_nonstop and full_load_any in a different way, savegame conversion wasn't working for them
-rw-r--r--src/saveload/order_sl.cpp7
-rw-r--r--src/settings.cpp4
2 files changed, 6 insertions, 5 deletions
diff --git a/src/saveload/order_sl.cpp b/src/saveload/order_sl.cpp
index ef11056ed..0ec506f1d 100644
--- a/src/saveload/order_sl.cpp
+++ b/src/saveload/order_sl.cpp
@@ -14,8 +14,8 @@ void Order::ConvertFromOldSavegame()
uint8 old_flags = this->flags;
this->flags = 0;
- /* First handle non-stop */
- if (_settings_client.gui.sg_new_nonstop) {
+ /* First handle non-stop - use value from savegame if possible, else use value from config file */
+ if (_settings_client.gui.sg_new_nonstop || (CheckSavegameVersion(22) && _settings_client.gui.new_nonstop)) {
/* OFB_NON_STOP */
this->SetNonStopType((old_flags & 8) ? ONSF_NO_STOP_AT_ANY_STATION : ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS);
} else {
@@ -35,7 +35,8 @@ void Order::ConvertFromOldSavegame()
} else if ((old_flags & 4) == 0) { // !OFB_FULL_LOAD
this->SetLoadType(OLF_LOAD_IF_POSSIBLE);
} else {
- this->SetLoadType(_settings_client.gui.sg_full_load_any ? OLF_FULL_LOAD_ANY : OLFB_FULL_LOAD);
+ /* old OTTD versions stored full_load_any in config file - assume it was enabled when loading */
+ this->SetLoadType(_settings_client.gui.sg_full_load_any || CheckSavegameVersion(22) ? OLF_FULL_LOAD_ANY : OLFB_FULL_LOAD);
}
/* Finally fix the unload flags */
diff --git a/src/settings.cpp b/src/settings.cpp
index d117f6893..5fc0b13b3 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1348,10 +1348,10 @@ const SettingDesc _settings[] = {
SDT_CONDBOOL(GameSettings, vehicle.dynamic_engines, 95, SL_MAX_VERSION, 0,NN, false, STR_CONFIG_SETTING_DYNAMIC_ENGINES, NULL),
SDT_BOOL(GameSettings, station.join_stations, 0, 0, true, STR_CONFIG_SETTING_JOINSTATIONS, NULL),
- SDTC_CONDBOOL( gui.sg_full_load_any, 0, 92, 0, 0 , true, STR_NULL, NULL),
+ SDTC_CONDBOOL( gui.sg_full_load_any, 22, 92, 0, 0, true, STR_NULL, NULL),
SDT_BOOL(GameSettings, order.improved_load, 0,NN, true, STR_CONFIG_SETTING_IMPROVEDLOAD, NULL),
SDT_BOOL(GameSettings, order.selectgoods, 0, 0, true, STR_CONFIG_SETTING_SELECTGOODS, NULL),
- SDTC_CONDBOOL( gui.sg_new_nonstop, 0, 92, 0, 0, false, STR_NULL, NULL),
+ SDTC_CONDBOOL( gui.sg_new_nonstop, 22, 92, 0, 0, false, STR_NULL, NULL),
SDT_BOOL(GameSettings, station.nonuniform_stations, 0,NN, true, STR_CONFIG_SETTING_NONUNIFORM_STATIONS, NULL),
SDT_VAR(GameSettings, station.station_spread, SLE_UINT8, 0, 0, 12, 4, 64, 0, STR_CONFIG_SETTING_STATION_SPREAD, InvalidateStationBuildWindow),
SDT_BOOL(GameSettings, order.serviceathelipad, 0, 0, true, STR_CONFIG_SETTING_SERVICEATHELIPAD, NULL),