diff options
| author | Max Horn | 2003-10-05 00:40:25 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-05 00:40:25 +0000 |
| commit | 48fd7e39d55e69fd0af624d80ea64d7e5e13eb1a (patch) | |
| tree | f437bed0adb3d6f53e0de3a7bbd38d18edc8cdff | |
| parent | a8da69bca54c422c1d89cf14bfa4a9bfcd136f06 (diff) | |
| download | scummvm-rg350-48fd7e39d55e69fd0af624d80ea64d7e5e13eb1a.tar.gz scummvm-rg350-48fd7e39d55e69fd0af624d80ea64d7e5e13eb1a.tar.bz2 scummvm-rg350-48fd7e39d55e69fd0af624d80ea64d7e5e13eb1a.zip | |
cleanup
svn-id: r10596
| -rw-r--r-- | backends/sdl/sdl.cpp | 30 | ||||
| -rw-r--r-- | backends/sdl/sdl_gl.cpp | 1 |
2 files changed, 14 insertions, 17 deletions
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp index d2b83fa102..c09c59d38e 100644 --- a/backends/sdl/sdl.cpp +++ b/backends/sdl/sdl.cpp @@ -62,6 +62,19 @@ void OSystem_SDL::load_gfx_mode() { _tmpScreenWidth = (_screenWidth + 3); switch(_mode) { + case GFX_NORMAL: + _scaleFactor = 1; + _scaler_proc = Normal1x; + break; + case GFX_DOUBLESIZE: + _scaleFactor = 2; + _scaler_proc = Normal2x; + break; + case GFX_TRIPLESIZE: + _scaleFactor = 3; + _scaler_proc = Normal3x; + break; + case GFX_2XSAI: _scaleFactor = 2; _scaler_proc = _2xSaI; @@ -99,25 +112,8 @@ void OSystem_SDL::load_gfx_mode() { _scaler_proc = DotMatrix; break; - case GFX_BILINEAR: - case GFX_DOUBLESIZE: - _scaleFactor = 2; - _scaler_proc = Normal2x; - break; - - case GFX_TRIPLESIZE: - _scaleFactor = 3; - _scaler_proc = Normal3x; - break; - - case GFX_NORMAL: - _scaleFactor = 1; - _scaler_proc = Normal1x; - break; default: error("unknown gfx mode %d", _mode); - _scaleFactor = 1; - _scaler_proc = NULL; } // diff --git a/backends/sdl/sdl_gl.cpp b/backends/sdl/sdl_gl.cpp index fec923edc0..bd05d831b1 100644 --- a/backends/sdl/sdl_gl.cpp +++ b/backends/sdl/sdl_gl.cpp @@ -103,6 +103,7 @@ void OSystem_SDL_OpenGL::load_gfx_mode() { case GFX_BILINEAR: _usingOpenGL = true; _mode = GFX_NORMAL; + // FIXME: shouldn't _scaleFactor be set here? break; case GFX_NORMAL: |