From 14ec3f45fa08a0c0071693f4094fc088eb0062b5 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 17 May 2006 23:52:45 +0000 Subject: - 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 --- backends/morphos/morphos.cpp | 2 +- backends/morphos/morphos.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'backends/morphos') diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp index 541f56c73b..889976afc4 100644 --- a/backends/morphos/morphos.cpp +++ b/backends/morphos/morphos.cpp @@ -1456,7 +1456,7 @@ void OSystem_MorphOS::clearSoundCallback() } } -void OSystem_MorphOS::initSize(uint w, uint h, int overlayScale) +void OSystem_MorphOS::initSize(uint w, uint h) { if (ScummBuffer) { diff --git a/backends/morphos/morphos.h b/backends/morphos/morphos.h index 7f919f7080..67ed8a481e 100644 --- a/backends/morphos/morphos.h +++ b/backends/morphos/morphos.h @@ -48,7 +48,7 @@ class OSystem_MorphOS : public OSystem // Set the size of the video bitmap. // Typically, 320x200 - virtual void initSize(uint w, uint h, int overlayScale); + virtual void initSize(uint w, uint h); // Draw a bitmap to screen. // The screen will not be updated to reflect the new bitmap -- cgit v1.2.3