aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorEugene Sandulenko2005-01-27 12:23:36 +0000
committerEugene Sandulenko2005-01-27 12:23:36 +0000
commit5a0085a5814c3e1f518d379697e34d12ed54269e (patch)
tree7a17d227a929e446bcbbcb3ab819ab82d1a06b81 /scumm
parentd1713410f2462ebdb7c601dab0fbf46803b2f74c (diff)
downloadscummvm-rg350-5a0085a5814c3e1f518d379697e34d12ed54269e.tar.gz
scummvm-rg350-5a0085a5814c3e1f518d379697e34d12ed54269e.tar.bz2
scummvm-rg350-5a0085a5814c3e1f518d379697e34d12ed54269e.zip
Fix regression with 640x480 HE games so it will not let them scale above 1x.
Though I _don't_ like this fix. It looks like a dirty hack to me. There is something completely wrong with our logics here. svn-id: r16644
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scumm.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 026f947254..89340b12e5 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -897,6 +897,12 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_hexdumpScripts = false;
_showStack = false;
+ // FIXME: a dirty hack. Currently this is checked before engine
+ // creation.
+ if (_heversion >= 71) {
+ _features |= GF_DEFAULT_TO_1X_SCALER;
+ }
+
if (_features & GF_FMTOWNS && _version == 3) { // FM-TOWNS V3 games use 320x240
_screenWidth = 320;
_screenHeight = 240;
@@ -1000,6 +1006,13 @@ int ScummEngine::init(GameDetector &detector) {
_system->beginGFXTransaction();
initCommonGFX(detector);
_system->initSize(_screenWidth, _screenHeight);
+
+ // FIXME: All this seems a dirty hack to me. We already
+ // have this check in constructor
+ if (_heversion >= 71) {
+ _features |= GF_DEFAULT_TO_1X_SCALER;
+ _system->setGraphicsMode("1x");
+ }
_system->endGFXTransaction();
int cd_num = ConfMan.getInt("cdrom");