diff options
Diffstat (limited to 'engines/engine.cpp')
| -rw-r--r-- | engines/engine.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/engines/engine.cpp b/engines/engine.cpp index 8fff99f3fc..aac9c8c717 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -223,7 +223,7 @@ void initCommonGFX(bool defaultTo1XScaler) { g_system->setGraphicsMode(gfxMode.c_str()); // HACK: For OpenGL modes, we will still honor the graphics scale override - if (defaultTo1XScaler && (gfxMode.equalsIgnoreCase("opengl_linear") || gfxMode.equalsIgnoreCase("opengl_nearest"))) + if (defaultTo1XScaler && gfxMode.equalsIgnoreCase("opengl")) g_system->resetGraphicsScale(); } } @@ -242,6 +242,10 @@ void initCommonGFX(bool defaultTo1XScaler) { // (De)activate fullscreen mode as determined by the config settings if (gameDomain && gameDomain->contains("fullscreen")) g_system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen")); + + // (De)activate filtering mode as determined by the config settings + if (gameDomain && gameDomain->contains("filtering")) + g_system->setFeatureState(OSystem::kFeatureFilteringMode, ConfMan.getBool("filtering")); } // Please leave the splash screen in working order for your releases, even if they're commercial. @@ -364,6 +368,11 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics: GUI::MessageDialog dialog(_("Could not apply fullscreen setting.")); dialog.runModal(); } + + if (gfxError & OSystem::kTransactionFilteringFailed) { + GUI::MessageDialog dialog(_("Could not apply filtering setting.")); + dialog.runModal(); + } } @@ -545,7 +554,7 @@ bool Engine::warnUserAboutUnsupportedGame() { if (ConfMan.getBool("enable_unsupported_game_warning")) { GUI::MessageDialog alert(_("WARNING: The game you are about to start is" " not yet fully supported by ScummVM. As such, it is likely to be" - " unstable, and any saves you make might not work in future" + " unstable, and any saved game you make might not work in future" " versions of ScummVM."), _("Start anyway"), _("Cancel")); return alert.runModal() == GUI::kMessageOK; } |