diff options
| author | smatz <smatz@openttd.org> | 2010-02-24 14:46:15 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2010-02-24 14:46:15 +0000 |
| commit | f051066bc451479a0c2ff44e2554941628a62f6a (patch) | |
| tree | 239197109c12b15a24e9ae8ab70a7549e34d4a8b /src/openttd.cpp | |
| parent | c1e2bc90cd3751dfa316519cfe2f558aa2697b2c (diff) | |
| download | openttd-f051066bc451479a0c2ff44e2554941628a62f6a.tar.xz | |
(svn r19224) -Codechange: change parameters passed to ShowErrorMessage() a bit
Diffstat (limited to 'src/openttd.cpp')
| -rw-r--r-- | src/openttd.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index a1559592e..869cb6f81 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -870,7 +870,7 @@ static void StartScenario() if (_file_to_saveload.mode == SL_INVALID) { DEBUG(sl, 0, "Savegame is obsolete or invalid format: '%s'", _file_to_saveload.name); SetDParamStr(0, GetSaveLoadErrorString()); - ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR); _game_mode = GM_MENU; return; } @@ -886,7 +886,7 @@ static void StartScenario() if (SaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, SCENARIO_DIR) != SL_OK) { LoadIntroGame(); SetDParamStr(0, GetSaveLoadErrorString()); - ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR); } _settings_game.difficulty = _settings_newgame.difficulty; @@ -1002,7 +1002,7 @@ void SwitchToMode(SwitchMode new_mode) if (!SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL, NO_DIRECTORY)) { LoadIntroGame(); SetDParamStr(0, GetSaveLoadErrorString()); - ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR); } else { if (_saveload_mode == SLD_LOAD_SCENARIO) { StartupEngines(); @@ -1047,7 +1047,7 @@ void SwitchToMode(SwitchMode new_mode) DoCommandP(0, PM_PAUSED_SAVELOAD, 0, CMD_PAUSE); } else { SetDParamStr(0, GetSaveLoadErrorString()); - ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR); } break; } @@ -1055,7 +1055,7 @@ void SwitchToMode(SwitchMode new_mode) case SM_MENU: // Switch to game intro menu LoadIntroGame(); if (BaseSounds::ini_set == NULL && BaseSounds::GetUsedSet()->fallback) { - ShowErrorMessage(STR_WARNING_FALLBACK_SOUNDSET, INVALID_STRING_ID, 0, 0, true); + ShowErrorMessage(STR_WARNING_FALLBACK_SOUNDSET, INVALID_STRING_ID, WL_CRITICAL); BaseSounds::ini_set = strdup(BaseSounds::GetUsedSet()->name); } break; @@ -1064,7 +1064,7 @@ void SwitchToMode(SwitchMode new_mode) /* Make network saved games on pause compatible to singleplayer */ if (SaveOrLoad(_file_to_saveload.name, SL_SAVE, NO_DIRECTORY) != SL_OK) { SetDParamStr(0, GetSaveLoadErrorString()); - ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR); } else { DeleteWindowById(WC_SAVELOAD, 0); } @@ -1081,7 +1081,7 @@ void SwitchToMode(SwitchMode new_mode) } if (_switch_mode_errorstr != INVALID_STRING_ID) { - ShowErrorMessage(_switch_mode_errorstr, INVALID_STRING_ID, 0, 0, true); + ShowErrorMessage(_switch_mode_errorstr, INVALID_STRING_ID, WL_CRITICAL); } } @@ -1239,7 +1239,7 @@ static void DoAutosave() DEBUG(sl, 2, "Autosaving to '%s'", buf); if (SaveOrLoad(buf, SL_SAVE, AUTOSAVE_DIR) != SL_OK) { - ShowErrorMessage(STR_ERROR_AUTOSAVE_FAILED, INVALID_STRING_ID, 0, 0); + ShowErrorMessage(STR_ERROR_AUTOSAVE_FAILED, INVALID_STRING_ID, WL_ERROR); } } |