diff options
Diffstat (limited to 'engines/macventure/gui.h')
-rw-r--r-- | engines/macventure/gui.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/macventure/gui.h b/engines/macventure/gui.h index 4e4eda7092..54e7b66945 100644 --- a/engines/macventure/gui.h +++ b/engines/macventure/gui.h @@ -65,6 +65,7 @@ enum MenuAction { enum WindowReference { kNoWindow = 0, + kInventoryStart = 1, kCommandsWindow = 0x80, kMainGameWindow = 0x81, kOutConsoleWindow = 0x82, @@ -171,6 +172,8 @@ struct DraggedObj { ObjID id; Common::Point pos; Common::Point mouseOffset; + Common::Point startPos; + WindowReference startWin; bool hasMoved; }; @@ -312,6 +315,7 @@ private: // Methods void selectDraggable(ObjID child, WindowReference origin, Common::Point startPos); void handleDragRelease(Common::Point pos, bool shiftPressed, bool isDoubleClick); Common::Rect calculateClickRect(Common::Point clickPos, Common::Rect windowBounds); + Common::Point localize(Common::Point point, WindowReference origin, WindowReference target); }; @@ -352,12 +356,11 @@ public: ~Cursor() {} void tick() { - executeState(); + executeState(); changeState(kTickCol); } bool processEvent(const Common::Event &event) { - executeState(); if (event.type == Common::EVENT_MOUSEMOVE) { _pos = event.mouse; |