From 987e72f4f2d89da1575b0c55eccdaff0d1ad4f99 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 8 Mar 2009 16:51:08 +0000 Subject: (svn r15645) -Fix (r12924)[FS#2612]: Add an EngineOverrideManager to give the term 'compatible newgrf' again some sense and to not crash because of trivial changes. --- src/saveload/saveload.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/saveload/saveload.cpp') diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 390f36b3c..f30440d5a 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -34,6 +34,7 @@ #include "../fileio_func.h" #include "../gamelog.h" #include "../string_func.h" +#include "../engine_base.h" #include "table/strings.h" @@ -1675,6 +1676,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb) /* Load a TTDLX or TTDPatch game */ if (mode == SL_OLD_LOAD) { + _engine_mngr.ResetToDefaultMapping(); InitializeGame(256, 256, true); // set a mapsize of 256x256 for TTDPatch games or it might get confused GamelogReset(); if (!LoadOldSaveGame(filename)) return SL_REINIT; @@ -1789,6 +1791,8 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR, err_str); } + _engine_mngr.ResetToDefaultMapping(); + /* Old maps were hardcoded to 256x256 and thus did not contain * any mapsize information. Pre-initialize to 256x256 to not to * confuse old games */ -- cgit v1.2.3-54-g00ecf