aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTorbjörn Andersson2018-06-25 07:03:56 +0200
committerThierry Crozat2018-06-29 21:59:39 +0200
commitbc1a9b06d4a20dc7f0d99c234838ba82e0810fe1 (patch)
treea647757ea2cfe8dd06f337060693f7995d17f77e /engines
parent0066b4a851ca2893e3c6aac86440247491b4000b (diff)
downloadscummvm-rg350-bc1a9b06d4a20dc7f0d99c234838ba82e0810fe1.tar.gz
scummvm-rg350-bc1a9b06d4a20dc7f0d99c234838ba82e0810fe1.tar.bz2
scummvm-rg350-bc1a9b06d4a20dc7f0d99c234838ba82e0810fe1.zip
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.
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/graphics/celobj32.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp
index dc2022433e..1b93aee4aa 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*