diff options
author | rubidium <rubidium@openttd.org> | 2014-09-14 15:11:33 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2014-09-14 15:11:33 +0000 |
commit | 32c56b5f84887ca8214bd290344c40dbc481f42d (patch) | |
tree | 47b9f49bec3064e31280aa7ad9d943f5e4057fbe /src/saveload/order_sl.cpp | |
parent | 5a2fd3630b4c942da25bbb0e5d5f4aee850fb2b3 (diff) | |
download | openttd-32c56b5f84887ca8214bd290344c40dbc481f42d.tar.xz |
(svn r26819) -Fix [FS#6112] (r26787): trying to delete just loaded objects that had not yet resolved their references caused a crash upon savegame load (only when loading a game from a server, e.g. joining MP)
Diffstat (limited to 'src/saveload/order_sl.cpp')
-rw-r--r-- | src/saveload/order_sl.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/saveload/order_sl.cpp b/src/saveload/order_sl.cpp index ba1f79c38..d55d577cb 100644 --- a/src/saveload/order_sl.cpp +++ b/src/saveload/order_sl.cpp @@ -295,20 +295,6 @@ void Load_BKOR() OrderBackup *ob = new (index) OrderBackup(); SlObject(ob, GetOrderBackupDescription()); } - - /* Only load order-backups for network clients. - * If we are a network server or not networking, then we just loaded a previously - * saved-by-server savegame. There are no clients with a backup, so clear it. - * Furthermore before savegame version 192 the actual content was always corrupt. - */ - if (!_networking || _network_server || IsSavegameVersionBefore(192)) { - /* Note: We cannot use CleanPool since that skips part of the destructor - * and then leaks un-reachable Orders in the order pool. */ - OrderBackup *ob; - FOR_ALL_ORDER_BACKUPS(ob) { - delete ob; - } - } } static void Ptrs_BKOR() |