diff options
Diffstat (limited to 'engines/simon')
| -rw-r--r-- | engines/simon/animation.cpp | 4 | ||||
| -rw-r--r-- | engines/simon/cursor.cpp | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/engines/simon/animation.cpp b/engines/simon/animation.cpp index 385c20473a..6bc3c813fd 100644 --- a/engines/simon/animation.cpp +++ b/engines/simon/animation.cpp @@ -26,6 +26,8 @@ #include "common/endian.h" #include "common/system.h" +#include "graphics/cursorman.h" + #include "simon/animation.h" #include "simon/intern.h" #include "simon/simon.h" @@ -87,7 +89,7 @@ bool MoviePlayer::load(const char *filename) { } debug(0, "Playing video %s", filename2); - _vm->_system->showMouse(false); + CursorMan.showMouse(false); if ((_vm->getPlatform() == Common::kPlatformAmiga || _vm->getPlatform() == Common::kPlatformMacintosh) && _vm->_language != Common::EN_ANY) { diff --git a/engines/simon/cursor.cpp b/engines/simon/cursor.cpp index ff331e5390..d2d0df3d30 100644 --- a/engines/simon/cursor.cpp +++ b/engines/simon/cursor.cpp @@ -25,6 +25,8 @@ #include "common/system.h" +#include "graphics/cursorman.h" + #include "simon/simon.h" namespace Simon { @@ -226,9 +228,9 @@ static const byte _simon2_cursors[10][256] = { void SimonEngine::drawMousePointer() { if (getGameType() == GType_SIMON2) { - _system->setMouseCursor(_simon2_cursors[_mouseCursor], 16, 16, 7, 7); + CursorMan.replaceCursor(_simon2_cursors[_mouseCursor], 16, 16, 7, 7); } else { - _system->setMouseCursor(_simon1_cursor, 16, 16, 0, 0); + CursorMan.replaceCursor(_simon1_cursor, 16, 16, 0, 0); } } @@ -236,11 +238,11 @@ void SimonEngine::handleMouseMoved() { uint x; if (_mouseHideCount) { - _system->showMouse(false); + CursorMan.showMouse(false); return; } - _system->showMouse(true); + CursorMan.showMouse(true); pollMouseXY(); if (_mouseX <= 0) @@ -433,7 +435,7 @@ void SimonEngine::drawMousePointer_FF() { offs = cursor * 32 + _mouseAnim * 2; drawMousePart(image, _mouseOffs[offs], _mouseOffs[offs + 1]); - _system->setMouseCursor(_mouseData, kMaxCursorWidth, kMaxCursorHeight, 19, 19, 0); + CursorMan.replaceCursor(_mouseData, kMaxCursorWidth, kMaxCursorHeight, 19, 19, 0); } } |