diff options
author | Eugene Sandulenko | 2006-05-18 02:03:43 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2006-05-18 02:03:43 +0000 |
commit | 4dfbfe7ecab6b44e4f1d3aee2a70d8e385323604 (patch) | |
tree | f45a4e9917c4509471251803527e4740a2bdb284 | |
parent | 3f62ce30693c55eb4bd47b4edffef87de8541a75 (diff) | |
download | scummvm-rg350-4dfbfe7ecab6b44e4f1d3aee2a70d8e385323604.tar.gz scummvm-rg350-4dfbfe7ecab6b44e4f1d3aee2a70d8e385323604.tar.bz2 scummvm-rg350-4dfbfe7ecab6b44e4f1d3aee2a70d8e385323604.zip |
- Revert additional setUpCursor() call as it broke in-game cursor palette
- Disable scaling for cursors which have target scale defined
svn-id: r22509
-rw-r--r-- | backends/sdl/graphics.cpp | 4 | ||||
-rw-r--r-- | gui/ThemeNew.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/backends/sdl/graphics.cpp b/backends/sdl/graphics.cpp index bf8396ca94..70f6d94c8f 100644 --- a/backends/sdl/graphics.cpp +++ b/backends/sdl/graphics.cpp @@ -1367,7 +1367,7 @@ void OSystem_SDL::blitCursor() { hH = hH1 = h * _scaleFactor / _cursorTargetScale; } - if (_adjustAspectRatio) { + if (_adjustAspectRatio && _cursorTargetScale == 1) { hH = real2Aspect(hH - 1) + 1; } @@ -1411,7 +1411,7 @@ void OSystem_SDL::blitCursor() { _mouseCurState.w, _mouseCurState.h); #ifndef DISABLE_SCALERS - if (_adjustAspectRatio) + if (_adjustAspectRatio && _cursorTargetScale == 1) cursorStretch200To240((uint8 *)_mouseSurface->pixels, _mouseSurface->pitch, hW, hH1, 0, 0, 0); #endif diff --git a/gui/ThemeNew.cpp b/gui/ThemeNew.cpp index 98287312e8..2a1718893e 100644 --- a/gui/ThemeNew.cpp +++ b/gui/ThemeNew.cpp @@ -336,7 +336,6 @@ bool ThemeNew::init() { _initOk = true; clearAll(); setupFonts(); - setUpCursor(); resetDrawArea(); } |