[Scummvm-git-logs] scummvm master -> 27eb9453bb25316dcfe881d9ee0baed99ed08e52

[criezy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8f3e1b7373 ENGINE: Allow stretch mode on a per-game basis
27eb9453bb GUI: Unset stretch-mode in game settings not overriding global settings


Commit: 8f3e1b7373edece88bb896add408dd02fe922086
    https://github.com/scummvm/scummvm/commit/8f3e1b7373edece88bb896add408dd02fe922086
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2018-10-22T22:08:39+01:00

Commit Message:
ENGINE: Allow stretch mode on a per-game basis

It was already possible to override the stretch mode per game
in the options dialog, but this was ignored when starting the
game from the launcher due to this bug.

Changed paths:
    engines/engine.cpp


diff --git a/engines/engine.cpp b/engines/engine.cpp
index 77ca54f..cc8c013 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -210,6 +210,9 @@ void initCommonGFX() {
 
 		if (gameDomain->contains("filtering"))
 			g_system->setFeatureState(OSystem::kFeatureFilteringMode, ConfMan.getBool("filtering"));
+
+		if (gameDomain->contains("stretch_mode"))
+			g_system->setStretchMode(ConfMan.get("stretch_mode").c_str());
 	}
 }
 


Commit: 27eb9453bb25316dcfe881d9ee0baed99ed08e52
    https://github.com/scummvm/scummvm/commit/27eb9453bb25316dcfe881d9ee0baed99ed08e52
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2018-10-22T22:08:39+01:00

Commit Message:
GUI: Unset stretch-mode in game settings not overriding global settings

Changed paths:
    gui/options.cpp


diff --git a/gui/options.cpp b/gui/options.cpp
index 7d692d9..efaacc9 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -514,6 +514,7 @@ void OptionsDialog::apply() {
 			ConfMan.removeKey("filtering", _domain);
 			ConfMan.removeKey("aspect_ratio", _domain);
 			ConfMan.removeKey("gfx_mode", _domain);
+			ConfMan.removeKey("stretch_mode", _domain);
 			ConfMan.removeKey("render_mode", _domain);
 		}
 	}