aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2005-03-09 23:07:32 +0000
committerEugene Sandulenko2005-03-09 23:07:32 +0000
commit7bb53f3bf10acf3b97d635b75e50b3c51b2ff862 (patch)
treeab25d421bbffb9d1e43079b3b40b2bab0e0fd820 /scumm/scumm.cpp
parentb72df416a64642d180e9b746484ce292d845fae4 (diff)
downloadscummvm-rg350-7bb53f3bf10acf3b97d635b75e50b3c51b2ff862.tar.gz
scummvm-rg350-7bb53f3bf10acf3b97d635b75e50b3c51b2ff862.tar.bz2
scummvm-rg350-7bb53f3bf10acf3b97d635b75e50b3c51b2ff862.zip
Patch #1013937 "OSystem layer with bigger resolution". Now you will always
get at least 640x400 window. And finally we have means of implementing nice looking GUI. Also updated all backends. If your backend has ability to run with 640x400 or 640x480 resolution then read patch tracker item to find out details. Other port maintainers shouldn't worry, as this patch doesn't affect them, they still get their 320x200. svn-id: r17055
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r--scumm/scumm.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index d0355ae35d..bef1538ff2 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1162,19 +1162,21 @@ int ScummEngine::init(GameDetector &detector) {
_system->beginGFXTransaction();
initCommonGFX(detector);
if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
- _system->initSize(Common::kHercW, Common::kHercH);
+ _system->initSize(Common::kHercW, Common::kHercH, 1);
_features |= GF_DEFAULT_TO_1X_SCALER;
_system->setGraphicsMode("1x");
} else {
- _system->initSize(_screenWidth, _screenHeight);
+ _system->initSize(_screenWidth, _screenHeight, 2);
+ if (_features & GF_DEFAULT_TO_1X_SCALER)
+ _system->setGraphicsMode("1x");
}
// 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");