- Heavily modified patch #1214784: "Disable overlay scaling"

- Eriktorbjorn's patch from same tracker item for scaling sword1/2 cutscenes
  is applied as is. It lacks resolution switch on-the-fly.
- GUI widgets are repositioned on the fly and use most space, even aspect
  ratio corrected screen is used without scaling
- Heavy tesing is required, but works for me in all cases except for bug
  #1483272: "GUI: SCUMM pause dialog breaks upon scaler switch" which needs more
  work.
- I probavly broke some backend or two

svn-id: r22505

1 files changed, 2 insertions, 2 deletions

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 7488bfb7b9..0c79a0b109 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -951,7 +951,7 @@ int ScummEngine::init() {
 	_system->beginGFXTransaction();
 		bool defaultTo1XScaler = false;
 		if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
-			_system->initSize(Common::kHercW, Common::kHercH, 1);
+			_system->initSize(Common::kHercW, Common::kHercH);
 			defaultTo1XScaler = true;
 		} else {
 			// FIXME: The way we now handle the force_1x_overlay setting implies
@@ -959,7 +959,7 @@ int ScummEngine::init() {
 			// set to true, it'll get reset to the default value (usually 'false'
 			// except for Symbian) before launching a game.
 			// This may or may not be the desired behavior...
-			_system->initSize(_screenWidth, _screenHeight, (ConfMan.getBool("force_1x_overlay") ? 1 : 2));
+			_system->initSize(_screenWidth, _screenHeight);
 			defaultTo1XScaler = (_screenWidth > 320);
 		}
 		initCommonGFX(defaultTo1XScaler);