diff options
| author | Nicola Mettifogo | 2011-01-29 10:42:56 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2011-01-29 10:42:56 +0000 |
| commit | 865f12a6431e97ecaaa2b488eadc7c70bf193137 (patch) | |
| tree | ed121223d77eb911034dd7ac9acacb3e735febef /engines/parallaction | |
| parent | d3ae7da133fa0a299145ed37b2825a2b21842b36 (diff) | |
| download | scummvm-rg350-865f12a6431e97ecaaa2b488eadc7c70bf193137.tar.gz scummvm-rg350-865f12a6431e97ecaaa2b488eadc7c70bf193137.tar.bz2 scummvm-rg350-865f12a6431e97ecaaa2b488eadc7c70bf193137.zip | |
PARALLACTION: Use CursorMan to control cursor instead of backend functions.
svn-id: r55611
Diffstat (limited to 'engines/parallaction')
| -rw-r--r-- | engines/parallaction/input.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp index ca8f358158..e508668d80 100644 --- a/engines/parallaction/input.cpp +++ b/engines/parallaction/input.cpp @@ -25,6 +25,7 @@ #include "common/events.h" #include "common/system.h" +#include "graphics/cursorman.h" #include "parallaction/exec.h" #include "parallaction/input.h" @@ -444,11 +445,11 @@ void Input::setMouseState(MouseTriState state) { switch (_mouseState) { case MOUSE_ENABLED_HIDE: case MOUSE_DISABLED: - _vm->_system->showMouse(false); + CursorMan.showMouse(false); break; case MOUSE_ENABLED_SHOW: - _vm->_system->showMouse(true); + CursorMan.showMouse(true); break; } } @@ -519,14 +520,14 @@ void Input::setArrowCursor() { // this stuff is needed to avoid artifacts with labels and selected items when switching cursors stopHovering(); _activeItem._id = 0; - _vm->_system->setMouseCursor(_mouseArrow->getData(0), MOUSEARROW_WIDTH_NS, MOUSEARROW_HEIGHT_NS, 0, 0, 0); + CursorMan.replaceCursor(_mouseArrow->getData(0), MOUSEARROW_WIDTH_NS, MOUSEARROW_HEIGHT_NS, 0, 0, 0); break; case GType_BRA: { Common::Rect r; _mouseArrow->getRect(0, r); - _vm->_system->setMouseCursor(_mouseArrow->getData(0), r.width(), r.height(), 0, 0, 0); - _vm->_system->showMouse(true); + CursorMan.replaceCursor(_mouseArrow->getData(0), r.width(), r.height(), 0, 0, 0); + CursorMan.showMouse(true); _activeItem._id = 0; break; } @@ -545,7 +546,7 @@ void Input::setInventoryCursor(ItemName name) { byte *v8 = _comboArrow->getData(0); // FIXME: destination offseting is not clear _vm->_inventoryRenderer->drawItem(name, v8 + 7 * MOUSECOMBO_WIDTH_NS + 7, MOUSECOMBO_WIDTH_NS); - _vm->_system->setMouseCursor(v8, MOUSECOMBO_WIDTH_NS, MOUSECOMBO_HEIGHT_NS, 0, 0, 0); + CursorMan.replaceCursor(v8, MOUSECOMBO_WIDTH_NS, MOUSECOMBO_HEIGHT_NS, 0, 0, 0); break; } @@ -555,7 +556,7 @@ void Input::setInventoryCursor(ItemName name) { memcpy(dst, src, _comboArrow->getSize(0)); // FIXME: destination offseting is not clear _vm->_inventoryRenderer->drawItem(name, dst + _mouseComboProps_BR._yOffset * _mouseComboProps_BR._width + _mouseComboProps_BR._xOffset, _mouseComboProps_BR._width); - _vm->_system->setMouseCursor(dst, _mouseComboProps_BR._width, _mouseComboProps_BR._height, 0, 0, 0); + CursorMan.replaceCursor(dst, _mouseComboProps_BR._width, _mouseComboProps_BR._height, 0, 0, 0); break; } |