aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gui
diff options
context:
space:
mode:
authorFilippos Karapetis2009-11-04 12:19:05 +0000
committerFilippos Karapetis2009-11-04 12:19:05 +0000
commit12e3375f3b47e6e626d8457257fd2036ed835ab1 (patch)
treed750bc29a6db7bc4443e7d60e2c23509bf95119f /engines/sci/gui
parenteffdfcd4b8c92475d41a15cefbfd711724280924 (diff)
downloadscummvm-rg350-12e3375f3b47e6e626d8457257fd2036ed835ab1.tar.gz
scummvm-rg350-12e3375f3b47e6e626d8457257fd2036ed835ab1.tar.bz2
scummvm-rg350-12e3375f3b47e6e626d8457257fd2036ed835ab1.zip
Removed the reference to SciGuiCursor from EngineState
svn-id: r45660
Diffstat (limited to 'engines/sci/gui')
-rw-r--r--engines/sci/gui/gui.cpp8
-rw-r--r--engines/sci/gui/gui.h10
2 files changed, 14 insertions, 4 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index d565d20c49..baca9e5005 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -737,6 +737,10 @@ void SciGui::setCursorPos(Common::Point pos) {
moveCursor(pos);
}
+Common::Point SciGui::getCursorPos() {
+ return _cursor->getPosition();
+}
+
void SciGui::moveCursor(Common::Point pos) {
pos.y += _windowMgr->_picWind->rect.top;
pos.x += _windowMgr->_picWind->rect.left;
@@ -756,6 +760,10 @@ void SciGui::moveCursor(Common::Point pos) {
// FIXME!
}
+void SciGui::setCursorZone(Common::Rect zone) {
+ _cursor->setMoveZone(zone);
+}
+
int16 SciGui::getCelWidth(GuiResourceId viewId, int16 loopNo, int16 celNo) {
return _gfx->getView(viewId)->getCelInfo(loopNo, celNo)->width;
}
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index 878f676553..f1cef36a6f 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -126,12 +126,14 @@ public:
virtual bool isItSkip(GuiResourceId viewId, int16 loopNo, int16 celNo, Common::Point position);
virtual void baseSetter(reg_t object);
- virtual void hideCursor();
- virtual void showCursor();
- virtual void setCursorShape(GuiResourceId cursorId);
- virtual void setCursorView(GuiResourceId viewNum, int loopNum, int cellNum, Common::Point *hotspot);
+ void hideCursor();
+ void showCursor();
+ void setCursorShape(GuiResourceId cursorId);
+ void setCursorView(GuiResourceId viewNum, int loopNum, int cellNum, Common::Point *hotspot);
virtual void setCursorPos(Common::Point pos);
+ Common::Point getCursorPos();
virtual void moveCursor(Common::Point pos);
+ void setCursorZone(Common::Rect zone);
virtual int16 getCelWidth(GuiResourceId viewId, int16 loopNo, int16 celNo);
virtual int16 getCelHeight(GuiResourceId viewId, int16 loopNo, int16 celNo);