diff options
| author | Eugene Sandulenko | 2006-05-17 23:52:45 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2006-05-17 23:52:45 +0000 |
| commit | 14ec3f45fa08a0c0071693f4094fc088eb0062b5 (patch) | |
| tree | 87e2af334bd1503eacc55c71cd5ccb94e5eb5751 /backends/x11 | |
| parent | 65091f7370ee118b8f99c6106d8cad1fd0ee719e (diff) | |
| download | scummvm-rg350-14ec3f45fa08a0c0071693f4094fc088eb0062b5.tar.gz scummvm-rg350-14ec3f45fa08a0c0071693f4094fc088eb0062b5.tar.bz2 scummvm-rg350-14ec3f45fa08a0c0071693f4094fc088eb0062b5.zip | |
- 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
Diffstat (limited to 'backends/x11')
| -rw-r--r-- | backends/x11/x11.cpp | 4 | ||||
| -rw-r--r-- | backends/x11/x11.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/x11/x11.cpp b/backends/x11/x11.cpp index e356bcc83d..915316a682 100644 --- a/backends/x11/x11.cpp +++ b/backends/x11/x11.cpp @@ -340,8 +340,8 @@ uint32 OSystem_X11::getMillis() { ((current_time.tv_usec - _start_time.tv_usec) / 1000)); } -void OSystem_X11::initSize(uint w, uint h, int overlaySize) { - //debug("initSize(%i, %i, %i)", w, h, overlaySize); +void OSystem_X11::initSize(uint w, uint h) { + //debug("initSize(%i, %i)", w, h); static XShmSegmentInfo shminfo; if (((uint)_fb_width != w) || ((uint)_fb_height != w)) { diff --git a/backends/x11/x11.h b/backends/x11/x11.h index 36085ccc00..ba29bc7eab 100644 --- a/backends/x11/x11.h +++ b/backends/x11/x11.h @@ -54,7 +54,7 @@ public: // Set the size of the video bitmap. // Typically, 320x200 - void initSize(uint w, uint h, int overlaySize); + void initSize(uint w, uint h); // Draw a bitmap to screen. // The screen will not be updated to reflect the new bitmap |