Mercurial > hg > openttd

changeset 17400:57a36b0111eb draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22146) -Fix: don't run savegame conversion during SlNullPointers; the pointer might not be converted or be NULL at that point
author rubidium <rubidium@openttd.org>
date Sat, 26 Feb 2011 17:56:51 +0000
parents c8b6698f2078
children db81c548202f
files src/saveload/saveload.cpp
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -450,6 +450,11 @@
 {
 	_sl.action = SLA_NULL;
 
+	/* We don't want any savegame conversion code to run
+	 * during NULLing; especially those that try to get
+	 * pointers from other pools. */
+	_sl_version = SAVEGAME_VERSION;
+
 	DEBUG(sl, 1, "Nulling pointers");
 
 	FOR_ALL_CHUNK_HANDLERS(ch) {