diff options
| author | Paul Gilbert | 2016-08-21 23:07:20 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-21 23:07:20 -0400 |
| commit | 3f32c4a4b9ef1ed6d151da1dbf3c299cc6f533b1 (patch) | |
| tree | 902e5f7388c7a5e44e5d6a2bdf98f34664e0848d /engines/titanic/core | |
| parent | e7d0047b5334bef6688a5f81c200630a58ff89c4 (diff) | |
| download | scummvm-rg350-3f32c4a4b9ef1ed6d151da1dbf3c299cc6f533b1.tar.gz scummvm-rg350-3f32c4a4b9ef1ed6d151da1dbf3c299cc6f533b1.tar.bz2 scummvm-rg350-3f32c4a4b9ef1ed6d151da1dbf3c299cc6f533b1.zip | |
TITANIC: Implemented CGondolierSlider class
Diffstat (limited to 'engines/titanic/core')
| -rw-r--r-- | engines/titanic/core/drop_target.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/core/drop_target.cpp b/engines/titanic/core/drop_target.cpp index cdd1d351fb..13a31c3f8a 100644 --- a/engines/titanic/core/drop_target.cpp +++ b/engines/titanic/core/drop_target.cpp @@ -115,7 +115,7 @@ bool CDropTarget::DropObjectMsg(CDropObjectMsg *msg) { bool CDropTarget::MouseDragStartMsg(CMouseDragStartMsg *msg) { if (!checkStartDragging(msg)) return false; - msg->_dragItem = msg->_dragItem; + //msg->_dragItem = msg->_dragItem; CGameObject *obj = dynamic_cast<CGameObject *>(findByName(_itemName)); if (_itemName.empty() || _fieldF4 || !obj) diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index a61dd17003..261e77877d 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1012,13 +1012,13 @@ Found CGameObject::find(const CString &name, CGameObject **item, int findAreas) void CGameObject::moveToView() { CViewItem *view = getGameManager()->getView(); detach(); - view->addUnder(this); + addUnder(view); } void CGameObject::moveToView(const CString &name) { CViewItem *view = parseView(name); detach(); - view->addUnder(this); + addUnder(view); } void CGameObject::stateInc14() { |