diff options
| author | Jody Northup | 2009-06-20 05:23:09 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-06-20 05:23:09 +0000 |
| commit | f7dd1c15ed38418a0371032966144eb6c2e004cb (patch) | |
| tree | dc292bcaf9c657bd1db9efbc56195e70c578ea0e /gui | |
| parent | 8b6ed92376024f43876af93fdfccd72d6fc33ac0 (diff) | |
| download | scummvm-rg350-f7dd1c15ed38418a0371032966144eb6c2e004cb.tar.gz scummvm-rg350-f7dd1c15ed38418a0371032966144eb6c2e004cb.tar.bz2 scummvm-rg350-f7dd1c15ed38418a0371032966144eb6c2e004cb.zip | |
renamed ENABLE_16BIT define to more accurate ENABLE_RGB_COLOR
svn-id: r41696
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/GuiManager.cpp | 6 | ||||
| -rw-r--r-- | gui/ThemeEngine.cpp | 8 | ||||
| -rw-r--r-- | gui/ThemeEngine.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/gui/GuiManager.cpp b/gui/GuiManager.cpp index fcfc02967e..8e161f3e60 100644 --- a/gui/GuiManager.cpp +++ b/gui/GuiManager.cpp @@ -135,7 +135,7 @@ bool GuiManager::loadNewTheme(Common::String id, ThemeEngine::GraphicsMode gfx) delete _theme; if (_useStdCursor) { -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR CursorMan.popCursorFormat(); #endif CursorMan.popCursorPalette(); @@ -385,7 +385,7 @@ void GuiManager::saveState() { void GuiManager::restoreState() { if (_useStdCursor) { -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR CursorMan.popCursorFormat(); #endif CursorMan.popCursor(); @@ -430,7 +430,7 @@ void GuiManager::setupCursor() { 87, 87, 87, 0 }; -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR Graphics::PixelFormat format; format.bytesPerPixel = 1; format.rLoss = format.gLoss = format.bLoss = format.aLoss = 8; diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index d8e368581c..70b295b989 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -434,7 +434,7 @@ void ThemeEngine::refresh() { _system->showOverlay(); if (_useCursor) { -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR CursorMan.replaceCursorFormat(_cursorFormat); #endif CursorMan.replaceCursorPalette(_cursorPal, 0, _cursorPalSize); @@ -448,7 +448,7 @@ void ThemeEngine::enable() { return; if (_useCursor) { -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR CursorMan.pushCursorFormat(_cursorFormat); #endif CursorMan.pushCursorPalette(_cursorPal, 0, _cursorPalSize); @@ -468,7 +468,7 @@ void ThemeEngine::disable() { _system->hideOverlay(); if (_useCursor) { -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR CursorMan.popCursorFormat(); #endif CursorMan.popCursorPalette(); @@ -1174,7 +1174,7 @@ bool ThemeEngine::createCursor(const Common::String &filename, int hotspotX, int if (!cursor) return false; -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR _cursorFormat.bytesPerPixel = 1; _cursorFormat.rLoss = _cursorFormat.gLoss = _cursorFormat.bLoss = _cursorFormat.aLoss = 8; _cursorFormat.rShift = _cursorFormat.gShift = _cursorFormat.bShift = _cursorFormat.aShift = 0; diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index 2a7bbcc6ce..74af16f09f 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -579,7 +579,7 @@ protected: ImagesMap _bitmaps; Graphics::PixelFormat _overlayFormat; -#ifdef ENABLE_16BIT +#ifdef ENABLE_RGB_COLOR Graphics::PixelFormat _cursorFormat; #endif |