- 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

2 files changed, 2 insertions, 2 deletions

diff --git a/base/engine.cpp b/base/engine.cpp
index ecc0f6dbf2..fcf0e7f513 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -253,7 +253,7 @@ void Engine::GUIErrorMessage(const Common::String msg) {
 	_system->setWindowCaption("Error");
 	_system->beginGFXTransaction();
 		initCommonGFX(false);
-		_system->initSize(320, 200, 2);
+		_system->initSize(320, 200);
 	_system->endGFXTransaction();
 
 	GUI::MessageDialog dialog(msg);
diff --git a/base/main.cpp b/base/main.cpp
index 683431b3c1..739d54a255 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -123,7 +123,7 @@ static bool launcherDialog(OSystem &system) {
 		system.setGraphicsMode(ConfMan.get("gfx_mode").c_str());
 
 		// Make GUI 640 x 400
-		system.initSize(320, 200, (ConfMan.getBool("force_1x_overlay") ? 1 : 2));
+		system.initSize(320, 200);
 	system.endGFXTransaction();