mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r27320) -Codechange: Do not drop order backups when loading a savegame for replaying.

release/1.6
frosch 2015-06-27 11:46:41 +00:00
parent b35b0a76db
commit 613212c486
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/saveload/afterload.cpp
View File

@ -16,6 +16,7 @@
#include "../fios.h" #include "../fios.h"
#include "../gamelog_internal.h" #include "../gamelog_internal.h"
#include "../network/network.h" #include "../network/network.h"
#include "../network/network_func.h"
#include "../gfxinit.h" #include "../gfxinit.h"
#include "../viewport_func.h" #include "../viewport_func.h"
#include "../industry.h" #include "../industry.h"
@ -2951,18 +2952,20 @@ bool AfterLoadGame()
} }
/* /*
* Only keep order-backups for network clients. * Only keep order-backups for network clients (and when replaying).
* If we are a network server or not networking, then we just loaded a previously * 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. * 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. * Furthermore before savegame version 192 the actual content was always corrupt.
*/ */
if (!_networking || _network_server || IsSavegameVersionBefore(192)) { if (!_networking || _network_server || IsSavegameVersionBefore(192)) {
#ifndef DEBUG_DUMP_COMMANDS
/* Note: We cannot use CleanPool since that skips part of the destructor /* Note: We cannot use CleanPool since that skips part of the destructor
* and then leaks un-reachable Orders in the order pool. */ * and then leaks un-reachable Orders in the order pool. */
OrderBackup *ob; OrderBackup *ob;
FOR_ALL_ORDER_BACKUPS(ob) { FOR_ALL_ORDER_BACKUPS(ob) {
delete ob; delete ob;
} }
#endif
} }