- 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

4 files changed, 6 insertions, 6 deletions

diff --git a/backends/PalmOS/Src/base_gfx.cpp b/backends/PalmOS/Src/base_gfx.cpp
index 9dddc0d14d..f9d3db5d4a 100755
--- a/backends/PalmOS/Src/base_gfx.cpp
+++ b/backends/PalmOS/Src/base_gfx.cpp
@@ -76,7 +76,7 @@ bool OSystem_PalmBase::setGraphicsMode(int mode) {
  *
  */
 
-void OSystem_PalmBase::initSize(uint w, uint h, int overlayScale) {
+void OSystem_PalmBase::initSize(uint w, uint h) {
 	_screenWidth	= w;
 	_screenHeight	= h;
 
@@ -88,7 +88,7 @@ void OSystem_PalmBase::initSize(uint w, uint h, int overlayScale) {
 	load_gfx_mode();
 
 	warpMouse(200, 150);
-	int_initSize(w, h, overlayScale);
+	int_initSize(w, h);
 }
 
 /*
diff --git a/backends/PalmOS/Src/be_base.h b/backends/PalmOS/Src/be_base.h
index f5cad4a903..a5ef22a226 100755
--- a/backends/PalmOS/Src/be_base.h
+++ b/backends/PalmOS/Src/be_base.h
@@ -67,7 +67,7 @@ private:
 	
 	virtual const GraphicsMode *int_getSupportedGraphicsModes() const;
 	virtual void int_updateScreen() = 0;
-	virtual void int_initSize(uint w, uint h, int overlayScale) = 0;
+	virtual void int_initSize(uint w, uint h) = 0;
 	virtual void int_setShakePos(int shakeOffset) { }
 
 	virtual void extras_palette(uint8 index, uint8 r, uint8 g, uint8 b) { }
@@ -195,7 +195,7 @@ public:
 	virtual bool setGraphicsMode(int mode);
 	virtual bool grabRawScreen(Graphics::Surface *surf) { return false; }
 
-	void initSize(uint w, uint h, int overlayScale);
+	void initSize(uint w, uint h);
 	int16 getWidth() { return _screenWidth; }
 	int16 getHeight() { return _screenHeight; }
 
diff --git a/backends/PalmOS/Src/be_os5.h b/backends/PalmOS/Src/be_os5.h
index 51070fac23..40a8340820 100755
--- a/backends/PalmOS/Src/be_os5.h
+++ b/backends/PalmOS/Src/be_os5.h
@@ -112,7 +112,7 @@ private:
 
 	virtual void int_initBackend();
 	virtual void int_updateScreen();
-	virtual void int_initSize(uint w, uint h, int overlayScale);
+	virtual void int_initSize(uint w, uint h);
 
 	virtual void unload_gfx_mode();
 	virtual void load_gfx_mode();
diff --git a/backends/PalmOS/Src/os5_gfx.cpp b/backends/PalmOS/Src/os5_gfx.cpp
index 73dea43513..2e2ec68454 100755
--- a/backends/PalmOS/Src/os5_gfx.cpp
+++ b/backends/PalmOS/Src/os5_gfx.cpp
@@ -33,7 +33,7 @@
 
 #include "oscalls.h"
 
-void OSystem_PalmOS5::int_initSize(uint w, uint h, int overlayScale) {
+void OSystem_PalmOS5::int_initSize(uint w, uint h) {
 }
 
 WinHandle OSystem_PalmOS5::alloc_screen(Coord w, Coord h) {