summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-09-09 21:12:52 +0000
committerrubidium <rubidium@openttd.org>2011-09-09 21:12:52 +0000
commita8889fd0e03d7b87a8bf61a259a926178e00e5e2 (patch)
tree8a3a36799d8a92500c157cf6ec044770ddbefdc0 /src/saveload
parent39eaf0e10d89188470878e9c89430d5352b1c009 (diff)
downloadopenttd-a8889fd0e03d7b87a8bf61a259a926178e00e5e2.tar.xz
(svn r22914) -Fix [FS#4716]: old TTO/TTD savegames could get non-stop via orders upon savegame loading, even when those orders did not exist back then. This 'conversion' feature is something for TTDPatch and old OpenTTD savegames
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/order_sl.cpp5
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 {