- 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/backends/ps2/systemps2.cpp b/backends/ps2/systemps2.cpp
index 320ad78b8f..3f8ee9c969 100644
--- a/backends/ps2/systemps2.cpp
+++ b/backends/ps2/systemps2.cpp
@@ -416,7 +416,7 @@ void OSystem_PS2::loadModules(void) {
 	sioprintf("Modules: UsbMouse %sloaded, UsbKbd %sloaded.", _useMouse ? "" : "not ", _useKbd ? "" : "not ");
 }
 
-void OSystem_PS2::initSize(uint width, uint height, int overscale) {
+void OSystem_PS2::initSize(uint width, uint height) {
 	printf("initializing new size: (%d/%d)...", width, height);
 	_screen->newScreenSize(width, height);
 	_screen->setMouseXy(width / 2, height / 2);
diff --git a/backends/ps2/systemps2.h b/backends/ps2/systemps2.h
index a77ea7a31a..e3de3e1a4e 100644
--- a/backends/ps2/systemps2.h
+++ b/backends/ps2/systemps2.h
@@ -45,7 +45,7 @@ class OSystem_PS2 : public OSystem {
 public:
 	OSystem_PS2(void);
 	virtual ~OSystem_PS2(void);
-	virtual void initSize(uint width, uint height, int overScale = -1);
+	virtual void initSize(uint width, uint height);
 
 	virtual int16 getHeight(void);
 	virtual int16 getWidth(void);