TITANIC: CCarry drag & move msg handlers

2 files changed, 16 insertions, 4 deletions

diff --git a/engines/titanic/messages/messages.h b/engines/titanic/messages/messages.h
index 82601e525f..e74c26fd97 100644
--- a/engines/titanic/messages/messages.h
+++ b/engines/titanic/messages/messages.h
@@ -319,7 +319,6 @@ MESSAGE0(COpeningCreditsMsg);
 MESSAGE1(CPanningAwayFromParrotMsg, int, value, 0);
 MESSAGE2(CParrotSpeakMsg, CString, value1, "", CString, value2, "");
 MESSAGE2(CParrotTriesChickenMsg, int, value1, 0, int, value2, 0);
-MESSAGE4(CPassOnDragStartMsg, int, value1, 0, int, value2, 0, int, value3, 0, int, value4, 0);
 MESSAGE1(CPhonographPlayMsg, int, value, 0);
 MESSAGE0(CPhonographReadyToPlayMsg);
 MESSAGE1(CPhonographRecordMsg, int, value, 0);
diff --git a/engines/titanic/messages/mouse_messages.h b/engines/titanic/messages/mouse_messages.h
index 811fdf0ad0..705247a2dc 100644
--- a/engines/titanic/messages/mouse_messages.h
+++ b/engines/titanic/messages/mouse_messages.h
@@ -139,14 +139,27 @@ public:
 	}
 };
 
+class CPassOnDragStartMsg : public CMessage {
+public:
+	Point _mousePos;
+public:
+	CLASSDEF
+	CPassOnDragStartMsg() : CMessage() {}
+	CPassOnDragStartMsg(const Point &pt) : CMessage(), _mousePos(pt) {}
+
+	static bool isSupportedBy(const CTreeItem *item) {
+		return supports(item, _type);
+	}
+};
+
 class CMouseDragEndMsg : public CMouseDragMsg {
 public:
-	CTreeItem *_dropTarget;
+	CGameObject *_dropTarget;
 public:
 	CLASSDEF
 	CMouseDragEndMsg() : CMouseDragMsg(), _dropTarget(nullptr) {}
-	CMouseDragEndMsg(const Point &pt, CTreeItem *dragItem = nullptr) :
-		CMouseDragMsg(pt), _dropTarget(dragItem) {}
+	CMouseDragEndMsg(const Point &pt, CGameObject *dropTarget = nullptr) :
+		CMouseDragMsg(pt), _dropTarget(dropTarget) {}
 
 	static bool isSupportedBy(const CTreeItem *item) {
 		return supports(item, _type);