From 7bb53f3bf10acf3b97d635b75e50b3c51b2ff862 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 9 Mar 2005 23:07:32 +0000
Subject: 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
---
 scumm/scumm.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'scumm/scumm.cpp')

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");
-- 
cgit v1.2.3