aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-07-20 18:53:27 +0000
committerTorbjörn Andersson2003-07-20 18:53:27 +0000
commit594c1f542d18fe5414c5ddf5fd730fdd032e3007 (patch)
tree0689d749d16dcc3990d30ab9f1c6d14789e132e1
parent43ba55e30898ec931f987cabb1a21923c7559612 (diff)
downloadscummvm-rg350-594c1f542d18fe5414c5ddf5fd730fdd032e3007.tar.gz
scummvm-rg350-594c1f542d18fe5414c5ddf5fd730fdd032e3007.tar.bz2
scummvm-rg350-594c1f542d18fe5414c5ddf5fd730fdd032e3007.zip
Fixed mishandling of _mode_flags that prevented the Simon games from using
the DF_WANT_RECT_OPTIM flag. svn-id: r9095
-rw-r--r--backends/sdl/sdl-common.cpp1
-rw-r--r--backends/sdl/sdl.cpp2
-rw-r--r--backends/sdl/sdl_gl.cpp2
3 files changed, 3 insertions, 2 deletions
diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp
index af809591fc..6578cf7685 100644
--- a/backends/sdl/sdl-common.cpp
+++ b/backends/sdl/sdl-common.cpp
@@ -59,6 +59,7 @@ void OSystem_SDL_Common::init_intern(int gfx_mode, bool full_screen, bool aspect
_mode = gfx_mode;
_full_screen = full_screen;
_adjustAspectRatio = aspect_ratio;
+ _mode_flags = 0;
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_JOYSTICK) ==-1) {
error("Could not initialize SDL: %s.\n", SDL_GetError());
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp
index 8d73295be4..b95d7a2775 100644
--- a/backends/sdl/sdl.cpp
+++ b/backends/sdl/sdl.cpp
@@ -56,7 +56,7 @@ OSystem_SDL::OSystem_SDL()
void OSystem_SDL::load_gfx_mode() {
_forceFull = true;
- _mode_flags = DF_UPDATE_EXPAND_1_PIXEL;
+ _mode_flags |= DF_UPDATE_EXPAND_1_PIXEL;
_tmpscreen = NULL;
_tmpScreenWidth = (_screenWidth + 3);
diff --git a/backends/sdl/sdl_gl.cpp b/backends/sdl/sdl_gl.cpp
index e58ce505e1..cc307eae58 100644
--- a/backends/sdl/sdl_gl.cpp
+++ b/backends/sdl/sdl_gl.cpp
@@ -94,7 +94,7 @@ void OSystem_SDL_OpenGL::load_gfx_mode() {
Amask = 0;
_forceFull = true;
- _mode_flags = DF_UPDATE_EXPAND_1_PIXEL;
+ _mode_flags |= DF_UPDATE_EXPAND_1_PIXEL;
_tmpscreen = NULL;
_tmpScreenWidth = (_screenWidth + 3);