diff options
| author | Paul Gilbert | 2016-04-11 18:53:40 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-10 16:10:54 -0400 |
| commit | 7e1f802abdab1442bd49f1c398c0aab6d81d452b (patch) | |
| tree | c281c3121ebed4bf5f5eee3b6d17d88faeb0aa2a /engines/titanic/pet_control | |
| parent | ad6ea25c99654b93c712a64fe322dce42e7fd0e8 (diff) | |
| download | scummvm-rg350-7e1f802abdab1442bd49f1c398c0aab6d81d452b.tar.gz scummvm-rg350-7e1f802abdab1442bd49f1c398c0aab6d81d452b.tar.bz2 scummvm-rg350-7e1f802abdab1442bd49f1c398c0aab6d81d452b.zip | |
TITANIC: CCarry drag & move msg handlers
Diffstat (limited to 'engines/titanic/pet_control')
| -rw-r--r-- | engines/titanic/pet_control/pet_control.h | 2 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_inventory.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_inventory.h | 2 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_section.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index 39bc5fb41b..f357c29378 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -193,7 +193,7 @@ public: /** * Handles drag ends within the PET */ - CTreeItem *dragEnd(const Point &pt) const { + CGameObject *dragEnd(const Point &pt) const { return _currentArea == PET_INVENTORY ? _inventory.dragEnd(pt) : nullptr; } }; diff --git a/engines/titanic/pet_control/pet_inventory.cpp b/engines/titanic/pet_control/pet_inventory.cpp index 79923bdb41..1104b653b6 100644 --- a/engines/titanic/pet_control/pet_inventory.cpp +++ b/engines/titanic/pet_control/pet_inventory.cpp @@ -64,7 +64,7 @@ void CPetInventory::load(SimpleFile *file, int param) { _field298 = file->readNumber(); } -CTreeItem *CPetInventory::dragEnd(const Point &pt) const { +CGameObject *CPetInventory::dragEnd(const Point &pt) const { warning("TODO: CPetInventory::dragEnd"); return nullptr; } diff --git a/engines/titanic/pet_control/pet_inventory.h b/engines/titanic/pet_control/pet_inventory.h index a0a9304fd6..16dfd227f1 100644 --- a/engines/titanic/pet_control/pet_inventory.h +++ b/engines/titanic/pet_control/pet_inventory.h @@ -84,7 +84,7 @@ public: /** * Returns item a drag-drop operation has dropped on, if any */ - virtual CTreeItem *dragEnd(const Point &pt) const; + virtual CGameObject *dragEnd(const Point &pt) const; /** * Returns true if the object is in a valid state diff --git a/engines/titanic/pet_control/pet_section.h b/engines/titanic/pet_control/pet_section.h index bc24737b1d..93a9145411 100644 --- a/engines/titanic/pet_control/pet_section.h +++ b/engines/titanic/pet_control/pet_section.h @@ -94,7 +94,7 @@ public: /** * Returns item a drag-drop operation has dropped on, if any */ - virtual CTreeItem *dragEnd(const Point &pt) const { return nullptr; } + virtual CGameObject *dragEnd(const Point &pt) const { return nullptr; } virtual void proc16(); |