diff options
| author | rubidium <rubidium@openttd.org> | 2008-12-26 18:24:05 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-12-26 18:24:05 +0000 |
| commit | a8cb9fa2f569ce8d6272d6a1887b17c99984a036 (patch) | |
| tree | 55f6256b6da03440a89a3e0cb2c789c9e4079b40 /src/saveload.cpp | |
| parent | 419f6e099f3b32a8b1f988dd7c912754589bf6d5 (diff) | |
| download | openttd-a8cb9fa2f569ce8d6272d6a1887b17c99984a036.tar.xz | |
(svn r14744) -Fix [FS#2474]: don't tell loading a savegame failed in two distinct ways.
Diffstat (limited to 'src/saveload.cpp')
| -rw-r--r-- | src/saveload.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/saveload.cpp b/src/saveload.cpp index ce11d3868..06789e8b0 100644 --- a/src/saveload.cpp +++ b/src/saveload.cpp @@ -1551,7 +1551,7 @@ const char *GetSaveLoadErrorString() static void SaveFileError() { SetDParamStr(0, GetSaveLoadErrorString()); - ShowErrorMessage(STR_012D, STR_NULL, 0, 0); + ShowErrorMessage(STR_JUST_RAW_STRING, STR_NULL, 0, 0); SaveFileDone(); } @@ -1603,8 +1603,8 @@ static SaveOrLoadResult SaveFileToDisk(bool threaded) AbortSaveLoad(); if (_sl.excpt_uninit != NULL) _sl.excpt_uninit(); - ShowInfo(GetSaveLoadErrorString()); - DEBUG(sl, 0, GetSaveLoadErrorString()); + /* Skip the "color" character */ + DEBUG(sl, 0, GetSaveLoadErrorString() + 3); if (threaded) { SetAsyncSaveFinish(SaveFileError); @@ -1803,7 +1803,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb) if (_sl.excpt_uninit != NULL) _sl.excpt_uninit(); /* Skip the "color" character */ - ShowInfoF(GetSaveLoadErrorString() + 3); + DEBUG(sl, 0, GetSaveLoadErrorString() + 3); /* A saver/loader exception!! reinitialize all variables to prevent crash! */ return (mode == SL_LOAD) ? SL_REINIT : SL_ERROR; |