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

(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)

Browse Source
This commit is contained in:
rubidium
2014-09-14 15:11:33 +00:00
parent 79e180250c
commit c225276a7a
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/saveload/order_sl.cpp
View File

@@ -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()