[Scummvm-git-logs] scummvm master -> bc1a9b06d4a20dc7f0d99c234838ba82e0810fe1

[criezy]

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

Summary:
bc1a9b06d4 SCI: Use LarryScale in games that support it, not just LSL7


Commit: bc1a9b06d4a20dc7f0d99c234838ba82e0810fe1
    https://github.com/scummvm/scummvm/commit/bc1a9b06d4a20dc7f0d99c234838ba82e0810fe1
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2018-06-29T21:59:39+02:00

Commit Message:
SCI: Use LarryScale in games that support it, not just LSL7

This is the solution discussed in bug #10568 ("SCI: PHANT1: Crash
on startup"). I believe that it's the correct solution, and that
ScummVM will do the right thing, but I'm not 100% sure.

Changed paths:
    engines/sci/graphics/celobj32.cpp


diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp
index dc20224..1b93aee 100644
--- a/engines/sci/graphics/celobj32.cpp
+++ b/engines/sci/graphics/celobj32.cpp
@@ -33,6 +33,7 @@
 #include "sci/util.h"
 #include "graphics/larryScale.h"
 #include "common/config-manager.h"
+#include "common/gui_options.h"
 
 namespace Sci {
 #pragma mark CelScaler
@@ -202,7 +203,7 @@ struct SCALER_Scale {
 
 		const CelScalerTable &table = CelObj::_scaler->getScalerTable(scaleX, scaleY);
 
-		const bool useLarryScale = (g_sci->getGameId() == GID_LSL7) && ConfMan.getBool("enable_larryscale");
+		const bool useLarryScale = Common::checkGameGUIOption(GAMEOPTION_LARRYSCALE, ConfMan.get("guioptions")) && ConfMan.getBool("enable_larryscale");
 		if (useLarryScale) {
 			// LarryScale is an alternative, high-quality cel scaler implemented
 			// for ScummVM. Due to the nature of smooth upscaling, it does *not*