diff options
| author | Torbjörn Andersson | 2007-02-12 00:04:56 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2007-02-12 00:04:56 +0000 |
| commit | 3bc06610659079e9320e4a0835af103a2fab11a5 (patch) | |
| tree | d2694b3fc19f21cc038a5170f2801386c7307073 /gui | |
| parent | 59eaade15df179df46bd28b4838887f5636ea3d9 (diff) | |
| download | scummvm-rg350-3bc06610659079e9320e4a0835af103a2fab11a5.tar.gz scummvm-rg350-3bc06610659079e9320e4a0835af103a2fab11a5.tar.bz2 scummvm-rg350-3bc06610659079e9320e4a0835af103a2fab11a5.zip | |
Merged the "palette manager" into the cursor manager. It was only used to
manage *cursor* palettes, so the name was misleading.
svn-id: r25500
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/ThemeModern.cpp | 7 | ||||
| -rw-r--r-- | gui/newgui.cpp | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/gui/ThemeModern.cpp b/gui/ThemeModern.cpp index 8452c8a37d..37f1e01844 100644 --- a/gui/ThemeModern.cpp +++ b/gui/ThemeModern.cpp @@ -28,7 +28,6 @@ #include "graphics/imagedec.h" #include "graphics/colormasks.h" #include "graphics/cursorman.h" -#include "graphics/paletteman.h" #include "common/config-manager.h" #include "common/file.h" @@ -160,7 +159,7 @@ void ThemeModern::refresh() { resetupGuiRenderer(); if (_enabled) { _system->showOverlay(); - PaletteMan.replaceCursorPalette(_cursorPal, 0, MAX_CURS_COLORS); + CursorMan.replaceCursorPalette(_cursorPal, 0, MAX_CURS_COLORS); CursorMan.replaceCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY, 255, _cursorTargetScale); } } @@ -179,7 +178,7 @@ void ThemeModern::enable() { void ThemeModern::disable() { _system->hideOverlay(); if (_useCursor) { - PaletteMan.popCursorPalette(); + CursorMan.popCursorPalette(); CursorMan.popCursor(); } _enabled = false; @@ -1477,7 +1476,7 @@ OverlayColor ThemeModern::calcDimColor(OverlayColor col) { #pragma mark - void ThemeModern::setUpCursor() { - PaletteMan.pushCursorPalette(_cursorPal, 0, MAX_CURS_COLORS); + CursorMan.pushCursorPalette(_cursorPal, 0, MAX_CURS_COLORS); CursorMan.pushCursor(_cursor, _cursorWidth, _cursorHeight, _cursorHotspotX, _cursorHotspotY, 255, _cursorTargetScale); CursorMan.showMouse(true); } diff --git a/gui/newgui.cpp b/gui/newgui.cpp index 62461a386b..6e941dd787 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -23,7 +23,6 @@ #include "common/system.h" #include "common/util.h" #include "graphics/cursorman.h" -#include "graphics/paletteman.h" #include "gui/newgui.h" #include "gui/dialog.h" #include "gui/eval.h" @@ -139,7 +138,7 @@ bool NewGui::loadNewTheme(const Common::String &style) { _theme->disable(); if (_useStdCursor) { - PaletteMan.popCursorPalette(); + CursorMan.popCursorPalette(); CursorMan.popCursor(); } @@ -367,7 +366,7 @@ void NewGui::saveState() { void NewGui::restoreState() { if (_useStdCursor) { CursorMan.popCursor(); - PaletteMan.popCursorPalette(); + CursorMan.popCursorPalette(); } _system->updateScreen(); @@ -415,7 +414,7 @@ void NewGui::setupCursor() { 87, 87, 87, 0 }; - PaletteMan.pushCursorPalette(palette, 0, 4); + CursorMan.pushCursorPalette(palette, 0, 4); CursorMan.pushCursor(NULL, 0, 0, 0, 0); CursorMan.showMouse(true); } |