diff options
| -rw-r--r-- | src/saveload/order_sl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/saveload/order_sl.cpp b/src/saveload/order_sl.cpp index f9fd46231..e60c35d8d 100644 --- a/src/saveload/order_sl.cpp +++ b/src/saveload/order_sl.cpp @@ -10,12 +10,11 @@ /** @file order_sl.cpp Code handling saving and loading of orders */ #include "../stdafx.h" -#include "../order_base.h" #include "../order_backup.h" #include "../settings_type.h" #include "../network/network.h" -#include "saveload.h" +#include "saveload_internal.h" /** * Converts this order from an old savegame's version; @@ -27,7 +26,7 @@ void Order::ConvertFromOldSavegame() this->flags = 0; /* First handle non-stop - use value from savegame if possible, else use value from config file */ - if (_settings_client.gui.sg_new_nonstop || (IsSavegameVersionBefore(22) && _settings_client.gui.new_nonstop)) { + if (_settings_client.gui.sg_new_nonstop || (IsSavegameVersionBefore(22) && _savegame_type != SGT_TTO && _savegame_type != SGT_TTD && _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 { |