TITANIC: Added remainder of CCarry msg handlers

2 files changed, 5 insertions, 14 deletions

diff --git a/engines/titanic/messages/messages.h b/engines/titanic/messages/messages.h
index 474565a69c..ab3078dd56 100644
--- a/engines/titanic/messages/messages.h
+++ b/engines/titanic/messages/messages.h
@@ -198,19 +198,6 @@ public:
 	}
 };
 
-class CSubAcceptCCarryMsg : public CMessage {
-public:
-	CString _string1;
-	int _value1, _value2, _value3;
-public:
-	CLASSDEF
-	CSubAcceptCCarryMsg() : _value1(0), _value2(0), _value3(0) {}
-
-	static bool isSupportedBy(const CTreeItem *item) {
-		return supports(item, _type);
-	}
-};
-
 class CTransportMsg : public CMessage {
 public:
 	CString _string;
@@ -366,6 +353,7 @@ MESSAGE2(CSpeechFallsFromTreeMsg, int, value1, 0, int, value2, 0);
 MESSAGE1(CStartMusicMsg, int, value, 0);
 MESSAGE3(CStatusChangeMsg, int, oldStatus, 0, int, newStatus, 0, bool, success, false);
 MESSAGE1(CStopMusicMsg, int, value, 0);
+MESSAGE4(CSubAcceptCCarryMsg, CString, string1, "", int, value1, 0, int, value2, 0, CCarry *, item, nullptr);
 MESSAGE0(CSubDeliverCCarryMsg);
 MESSAGE0(CSubSendCCarryMsg);
 MESSAGE0(CSUBTransition);
diff --git a/engines/titanic/messages/mouse_messages.h b/engines/titanic/messages/mouse_messages.h
index 705247a2dc..ce02e1df73 100644
--- a/engines/titanic/messages/mouse_messages.h
+++ b/engines/titanic/messages/mouse_messages.h
@@ -142,10 +142,13 @@ public:
 class CPassOnDragStartMsg : public CMessage {
 public:
 	Point _mousePos;
+	int _value3;
+	int _value4;
 public:
 	CLASSDEF
 	CPassOnDragStartMsg() : CMessage() {}
-	CPassOnDragStartMsg(const Point &pt) : CMessage(), _mousePos(pt) {}
+	CPassOnDragStartMsg(const Point &pt, int v3 = 0, int v4 = 0) : 
+		CMessage(), _mousePos(pt), _value3(v3), _value4(v4) {}
 
 	static bool isSupportedBy(const CTreeItem *item) {
 		return supports(item, _type);