diff options
| author | Jody Northup | 2009-06-24 06:44:30 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-06-24 06:44:30 +0000 |
| commit | 865129a5630017f05d08e778ba1ef430c23cd55a (patch) | |
| tree | 302b20f7e4366d8e5b91cffde7420a0f719771ec /gui | |
| parent | 4a380dc0d8b1a75fa31e0b4511e03b0782b43f89 (diff) | |
| download | scummvm-rg350-865129a5630017f05d08e778ba1ef430c23cd55a.tar.gz scummvm-rg350-865129a5630017f05d08e778ba1ef430c23cd55a.tar.bz2 scummvm-rg350-865129a5630017f05d08e778ba1ef430c23cd55a.zip | |
made the cursor's pixel format a member of the cursor object, merged ____CursorFormat functions into equivalent ____Cursor functions.
svn-id: r41825
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/GuiManager.cpp | 14 | ||||
| -rw-r--r-- | gui/ThemeEngine.cpp | 9 |
2 files changed, 0 insertions, 23 deletions
diff --git a/gui/GuiManager.cpp b/gui/GuiManager.cpp index 8e161f3e60..cf8b7b2d9d 100644 --- a/gui/GuiManager.cpp +++ b/gui/GuiManager.cpp @@ -135,9 +135,6 @@ bool GuiManager::loadNewTheme(Common::String id, ThemeEngine::GraphicsMode gfx) delete _theme; if (_useStdCursor) { -#ifdef ENABLE_RGB_COLOR - CursorMan.popCursorFormat(); -#endif CursorMan.popCursorPalette(); CursorMan.popCursor(); } @@ -385,9 +382,6 @@ void GuiManager::saveState() { void GuiManager::restoreState() { if (_useStdCursor) { -#ifdef ENABLE_RGB_COLOR - CursorMan.popCursorFormat(); -#endif CursorMan.popCursor(); CursorMan.popCursorPalette(); } @@ -430,14 +424,6 @@ void GuiManager::setupCursor() { 87, 87, 87, 0 }; -#ifdef ENABLE_RGB_COLOR - Graphics::PixelFormat format; - format.bytesPerPixel = 1; - format.rLoss = format.gLoss = format.bLoss = format.aLoss = 8; - format.rShift = format.gShift = format.bShift = format.aShift = 0; - - CursorMan.pushCursorFormat(format); -#endif CursorMan.pushCursorPalette(palette, 0, 4); CursorMan.pushCursor(NULL, 0, 0, 0, 0); CursorMan.showMouse(true); diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index 70b295b989..6041fb8858 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -434,9 +434,6 @@ void ThemeEngine::refresh() { _system->showOverlay(); if (_useCursor) { -#ifdef ENABLE_RGB_COLOR - CursorMan.replaceCursorFormat(_cursorFormat); -#endif CursorMan.replaceCursorPalette(_cursorPal, 0, _cursorPalSize); CursorMan.replaceCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY, 255, _cursorTargetScale); } @@ -448,9 +445,6 @@ void ThemeEngine::enable() { return; if (_useCursor) { -#ifdef ENABLE_RGB_COLOR - CursorMan.pushCursorFormat(_cursorFormat); -#endif CursorMan.pushCursorPalette(_cursorPal, 0, _cursorPalSize); CursorMan.pushCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY, 255, _cursorTargetScale); CursorMan.showMouse(true); @@ -468,9 +462,6 @@ void ThemeEngine::disable() { _system->hideOverlay(); if (_useCursor) { -#ifdef ENABLE_RGB_COLOR - CursorMan.popCursorFormat(); -#endif CursorMan.popCursorPalette(); CursorMan.popCursor(); } |