diff options
| author | rubidium <rubidium@openttd.org> | 2011-02-26 17:56:51 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-02-26 17:56:51 +0000 |
| commit | ae6dca77e5f4028bb07b82ec5cf2e6a27d488a26 (patch) | |
| tree | 483f1545c81850ec5a5b3a5dded8ad59ed0ec676 /src/saveload/saveload.cpp | |
| parent | 31386c42a7aa51b5b6a7abfc728b9ed4e34df0ea (diff) | |
| download | openttd-ae6dca77e5f4028bb07b82ec5cf2e6a27d488a26.tar.xz | |
(svn r22146) -Fix: don't run savegame conversion during SlNullPointers; the pointer might not be converted or be NULL at that point
Diffstat (limited to 'src/saveload/saveload.cpp')
| -rw-r--r-- | src/saveload/saveload.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 4b7e3845a..25c1fe958 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -450,6 +450,11 @@ static void SlNullPointers() { _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) { |