From ba4fd897b823fa4dc36ad3fbf0db36b94b95628b Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 6 Aug 2009 22:00:32 +0000 Subject: (svn r17097) -Fix [FS#3092] (r13256): make restart command work again and make the help show how it works and how it doesn't work --- src/saveload/saveload.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/saveload/saveload.cpp') diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 88be40d72..731679dc5 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -1633,7 +1633,7 @@ static const SaveLoadFormat *GetSavegameFormat(const char *s) } /* actual loader/saver function */ -void InitializeGame(uint size_x, uint size_y, bool reset_date); +void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settings); extern bool AfterLoadGame(); extern bool LoadOldSaveGame(const char *file); @@ -1793,7 +1793,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 + InitializeGame(256, 256, true, true); // set a mapsize of 256x256 for TTDPatch games or it might get confused GamelogReset(); if (!LoadOldSaveGame(filename)) return SL_REINIT; _sl_version = 0; @@ -1912,7 +1912,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb) /* Old maps were hardcoded to 256x256 and thus did not contain * any mapsize information. Pre-initialize to 256x256 to not to * confuse old games */ - InitializeGame(256, 256, true); + InitializeGame(256, 256, true, true); GamelogReset(); -- cgit v1.2.3-54-g00ecf