thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ENGINES: More consistent error messages

Browse source
This commit is contained in:
Ben Castricum 2019-09-13 09:29:25 +02:00 • committed by Thierry Crozat
parent eee786d71f
commit d7af4a8c1c
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/engine.cpp
View file

@ -309,7 +309,7 @@ void initGraphics(int width, int height, const Graphics::PixelFormat *format) {
// Error out on size switch failure
if (gfxError & OSystem::kTransactionSizeChangeFailed) {
Common::String message;
message = Common::String::format("Could not switch to resolution: '%dx%d'.", width, height);
message = Common::String::format(_("Could not switch to resolution '%dx%d'."), width, height);
GUIErrorMessage(message);
error("%s", message.c_str());
@ -326,18 +326,16 @@ void initGraphics(int width, int height, const Graphics::PixelFormat *format) {
#endif
if (gfxError & OSystem::kTransactionModeSwitchFailed) {
Common::String message = _("Could not switch to video mode: '");
message += ConfMan.get("gfx_mode");
message += "'.";
Common::String message;
message = Common::String::format(_("Could not switch to video mode '%s'."), ConfMan.get("gfx_mode").c_str());
GUI::MessageDialog dialog(message);
dialog.runModal();
}
if (gfxError & OSystem::kTransactionStretchModeSwitchFailed) {
Common::String message = _("Could not switch to stretch mode: '");
message += ConfMan.get("stretch_mode");
message += "'.";
Common::String message;
message = Common::String::format(_("Could not switch to stretch mode '%s'."), ConfMan.get("stretch_mode").c_str());
GUI::MessageDialog dialog(message);
dialog.runModal();
@ -531,7 +529,7 @@ void Engine::openMainMenuDialog() {
// Load savegame after main menu execution
// (not from inside the menu loop to avoid
// mouse cursor glitches and simliar bugs,
// mouse cursor glitches and similar bugs,
// e.g. #2822778).
if (_saveSlotToLoad >= 0) {
Common::Error status = loadGameState(_saveSlotToLoad);