diff options
| author | Jody Northup | 2009-06-05 23:59:40 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-06-05 23:59:40 +0000 |
| commit | d65bbe1d7a5efbcf04831dbb68a45ca833db1ae1 (patch) | |
| tree | 9061e150b7671af93508c1017381e8d7ba3cad3d /gui | |
| parent | ccee18a489ece14c499c4e0c43aeb7fc216451fb (diff) | |
| download | scummvm-rg350-d65bbe1d7a5efbcf04831dbb68a45ca833db1ae1.tar.gz scummvm-rg350-d65bbe1d7a5efbcf04831dbb68a45ca833db1ae1.tar.bz2 scummvm-rg350-d65bbe1d7a5efbcf04831dbb68a45ca833db1ae1.zip | |
Fixes ScummEngine_v70he::setDefaultCursor to work in 16-bit, using a temporary hack.
svn-id: r41204
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/GuiManager.cpp | 8 | ||||
| -rw-r--r-- | gui/ThemeEngine.cpp | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/gui/GuiManager.cpp b/gui/GuiManager.cpp index cf8b7b2d9d..bb988edc78 100644 --- a/gui/GuiManager.cpp +++ b/gui/GuiManager.cpp @@ -135,8 +135,12 @@ bool GuiManager::loadNewTheme(Common::String id, ThemeEngine::GraphicsMode gfx) delete _theme; if (_useStdCursor) { +#ifdef ENABLE_16BIT + CursorMan.popCursor16(); +#else CursorMan.popCursorPalette(); CursorMan.popCursor(); +#endif } // @@ -382,8 +386,12 @@ void GuiManager::saveState() { void GuiManager::restoreState() { if (_useStdCursor) { +#ifdef ENABLE_16BIT + CursorMan.popCursor16(); +#else CursorMan.popCursor(); CursorMan.popCursorPalette(); +#endif } _system->updateScreen(); diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index fe93a1f7d6..c8d960f014 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -462,8 +462,12 @@ void ThemeEngine::disable() { _system->hideOverlay(); if (_useCursor) { +#ifdef ENABLE_16BIT + CursorMan.popCursor16(); +#else CursorMan.popCursorPalette(); CursorMan.popCursor(); +#endif } _enabled = false; |