diff options
| author | Eugene Sandulenko | 2005-09-20 18:16:09 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-09-20 18:16:09 +0000 |
| commit | aa33153569afda655b988a4c9a1efee261ca107e (patch) | |
| tree | 7a9cbf46280a62bc8c582fa77e9939d4d8f883e6 /backends/sdl/sdl.cpp | |
| parent | a0cff37f0697cd0082ca5fabac38159b265f4471 (diff) | |
| download | scummvm-rg350-aa33153569afda655b988a4c9a1efee261ca107e.tar.gz scummvm-rg350-aa33153569afda655b988a4c9a1efee261ca107e.tar.bz2 scummvm-rg350-aa33153569afda655b988a4c9a1efee261ca107e.zip | |
Normalize use of DISABLE_SCALERS. Now it really disables all scalers
except essential Normal1x. Also thumbnails get compiled unconditionally
so we get them on all platforms, even those which never display them.
Sorted out mess brought to sdl backend by epoc maintainer. He misused
__SYMBIAN32__ where DISABLE_SCALERS is more appropriate.
svn-id: r18850
Diffstat (limited to 'backends/sdl/sdl.cpp')
| -rw-r--r-- | backends/sdl/sdl.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp index 43042df8e4..6318519a0b 100644 --- a/backends/sdl/sdl.cpp +++ b/backends/sdl/sdl.cpp @@ -63,7 +63,7 @@ void OSystem_SDL::initBackend() { SDL_EnableUNICODE(1); _cksumValid = false; -#if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) +#if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) && !defined(DISABLE_SCALERS) _mode = GFX_DOUBLESIZE; _scaleFactor = 2; _scalerProc = Normal2x; @@ -73,7 +73,13 @@ void OSystem_SDL::initBackend() { _mode = GFX_NORMAL; _scaleFactor = 1; _scalerProc = Normal1x; + +#if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) + _fullscreen = ConfMan.getBool("fullscreen"); +#else _fullscreen = true; +#endif + _adjustAspectRatio = false; #endif _scalerType = 0; |