summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-08-06 22:00:32 +0000
committerrubidium <rubidium@openttd.org>2009-08-06 22:00:32 +0000
commitba4fd897b823fa4dc36ad3fbf0db36b94b95628b (patch)
treef68e0b5d1bb325182e763285855fca5dfd128856 /src/saveload
parent3ecf3357181c0f01896d97d0a7b40bf9206d7327 (diff)
downloadopenttd-ba4fd897b823fa4dc36ad3fbf0db36b94b95628b.tar.xz
(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
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/saveload.cpp6
1 files changed, 3 insertions, 3 deletions
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();