made the cursor's pixel format a member of the cursor object, merged ____CursorFormat functions into equivalent ____Cursor functions.

svn-id: r41825
This commit is contained in:
Jody Northup 2009-06-24 06:44:30 +00:00
parent 4a380dc0d8
commit 865129a563
8 changed files with 36 additions and 126 deletions

View file

@ -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();
}