diff options
Diffstat (limited to 'engines/sci/gui32')
-rw-r--r-- | engines/sci/gui32/gui32.cpp | 22 | ||||
-rw-r--r-- | engines/sci/gui32/gui32.h | 4 |
2 files changed, 3 insertions, 23 deletions
diff --git a/engines/sci/gui32/gui32.cpp b/engines/sci/gui32/gui32.cpp index edb901054c..5692c9b119 100644 --- a/engines/sci/gui32/gui32.cpp +++ b/engines/sci/gui32/gui32.cpp @@ -934,7 +934,7 @@ reg_t SciGui32::menuSelect(reg_t eventObject) { } } - Common::Point cursorPos = _s->_cursor->getPosition(); + Common::Point cursorPos = _cursor->getPosition(); if ((type == SCI_EVT_MOUSE_PRESS) && (cursorPos.y < 10)) { menu_mode = 1; @@ -1027,7 +1027,7 @@ reg_t SciGui32::menuSelect(reg_t eventObject) { case SCI_EVT_MOUSE_RELEASE: { - Common::Point curMousePos = _s->_cursor->getPosition(); + Common::Point curMousePos = _cursor->getPosition(); menu_mode = (curMousePos.y < 10); claimed = !menu_mode && !_s->_menubar->mapPointer(curMousePos, menu_nr, item_nr, portBounds); mouse_down = 0; @@ -1044,7 +1044,7 @@ reg_t SciGui32::menuSelect(reg_t eventObject) { } if (mouse_down) - _s->_menubar->mapPointer(_s->_cursor->getPosition(), menu_nr, item_nr, portBounds); + _s->_menubar->mapPointer(_cursor->getPosition(), menu_nr, item_nr, portBounds); if ((item_nr > -1 && old_item == -1) || (menu_nr != old_menu)) { /* Update menu */ @@ -2962,22 +2962,6 @@ bool SciGui32::canBeHere(reg_t curObject, reg_t listReference) { return retval; } -void SciGui32::hideCursor() { - _cursor->hide(); -} - -void SciGui32::showCursor() { - _cursor->show(); -} - -void SciGui32::setCursorShape(GuiResourceId cursorId) { - _cursor->setShape(cursorId); -} - -void SciGui32::setCursorView(GuiResourceId viewNum, int loopNum, int cellNum, Common::Point *hotspot) { - _cursor->setView(viewNum, loopNum, cellNum, hotspot); -} - void SciGui32::setCursorPos(Common::Point pos) { pos.y += _s->port->_bounds.y; pos.x += _s->port->_bounds.x; diff --git a/engines/sci/gui32/gui32.h b/engines/sci/gui32/gui32.h index d8a49542bb..dcdcf717af 100644 --- a/engines/sci/gui32/gui32.h +++ b/engines/sci/gui32/gui32.h @@ -102,10 +102,6 @@ public: void setNowSeen(reg_t objectReference); bool canBeHere(reg_t curObject, reg_t listReference); - void hideCursor(); - void showCursor(); - void setCursorShape(GuiResourceId cursorId); - void setCursorView(GuiResourceId viewNum, int loopNum, int cellNum, Common::Point *hotspot); void setCursorPos(Common::Point pos); void moveCursor(Common::Point pos); |