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/openttd.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/openttd.cpp')
| -rw-r--r-- | src/openttd.cpp | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index 3cbe953b3..b658e8944 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -799,9 +799,8 @@ static void StartScenario() /* invalid type */ if (_file_to_saveload.mode == SL_INVALID) { DEBUG(sl, 0, "Savegame is obsolete or invalid format: '%s'", _file_to_saveload.name); - SetDParam(0, STR_JUST_RAW_STRING); - SetDParamStr(1, GetSaveLoadErrorString()); - ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0); + SetDParamStr(0, GetSaveLoadErrorString()); + ShowErrorMessage(INVALID_STRING_ID, STR_JUST_RAW_STRING, 0, 0); _game_mode = GM_MENU; return; } @@ -816,9 +815,8 @@ static void StartScenario() /* Load game */ if (SaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, SCENARIO_DIR) != SL_OK) { LoadIntroGame(); - SetDParam(0, STR_JUST_RAW_STRING); - SetDParamStr(1, GetSaveLoadErrorString()); - ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0); + SetDParamStr(0, GetSaveLoadErrorString()); + ShowErrorMessage(INVALID_STRING_ID, STR_JUST_RAW_STRING, 0, 0); } _settings_game.difficulty = _settings_newgame.difficulty; @@ -929,9 +927,8 @@ void SwitchMode(int new_mode) if (!SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL, NO_DIRECTORY)) { LoadIntroGame(); - SetDParam(0, STR_JUST_RAW_STRING); - SetDParamStr(1, GetSaveLoadErrorString()); - ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0); + SetDParamStr(0, GetSaveLoadErrorString()); + ShowErrorMessage(INVALID_STRING_ID, STR_JUST_RAW_STRING, 0, 0); } else { if (_saveload_mode == SLD_LOAD_SCENARIO) { StartupEngines(); @@ -971,9 +968,8 @@ void SwitchMode(int new_mode) SetLocalCompany(OWNER_NONE); _settings_newgame.game_creation.starting_year = _cur_year; } else { - SetDParam(0, STR_JUST_RAW_STRING); - SetDParamStr(1, GetSaveLoadErrorString()); - ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0); + SetDParamStr(0, GetSaveLoadErrorString()); + ShowErrorMessage(INVALID_STRING_ID, STR_JUST_RAW_STRING, 0, 0); } break; } @@ -986,9 +982,8 @@ void SwitchMode(int new_mode) /* Make network saved games on pause compatible to singleplayer */ if (_networking && _pause_game == 1) _pause_game = 2; if (SaveOrLoad(_file_to_saveload.name, SL_SAVE, NO_DIRECTORY) != SL_OK) { - SetDParam(0, STR_JUST_RAW_STRING); - SetDParamStr(1, GetSaveLoadErrorString()); - ShowErrorMessage(INVALID_STRING_ID, STR_012D, 0, 0); + SetDParamStr(0, GetSaveLoadErrorString()); + ShowErrorMessage(INVALID_STRING_ID, STR_JUST_RAW_STRING, 0, 0); } else { DeleteWindowById(WC_SAVELOAD, 0); } |