1 files changed, 101 insertions, 7 deletions

diff --git a/engines/titanic/game/restaurant_cylinder_holder.cpp b/engines/titanic/game/restaurant_cylinder_holder.cpp
index d70009f151..8726d1a925 100644
--- a/engines/titanic/game/restaurant_cylinder_holder.cpp
+++ b/engines/titanic/game/restaurant_cylinder_holder.cpp
@@ -24,20 +24,29 @@
 
 namespace Titanic {
 
+BEGIN_MESSAGE_MAP(CRestaurantCylinderHolder, CDropTarget)
+	ON_MESSAGE(EjectCylinderMsg)
+	ON_MESSAGE(EnterViewMsg)
+	ON_MESSAGE(MovieEndMsg)
+	ON_MESSAGE(QueryCylinderHolderMsg)
+	ON_MESSAGE(QueryCylinderNameMsg)
+	ON_MESSAGE(MouseDragStartMsg)
+END_MESSAGE_MAP()
+
 CRestaurantCylinderHolder::CRestaurantCylinderHolder() : CDropTarget(),
 	_field118(0), _field11C(0), _field12C(0), _field130(0),
-	_string6("z#61.wav"), _field140(1) {
+	_ejectSoundName("z#61.wav"), _defaultCursorId(CURSOR_ARROW) {
 }
 
 void CRestaurantCylinderHolder::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_field118, indent);
 	file->writeNumberLine(_field11C, indent);
-	file->writeQuotedLine(_string5, indent);
+	file->writeQuotedLine(_target, indent);
 	file->writeNumberLine(_field12C, indent);
 	file->writeNumberLine(_field130, indent);
-	file->writeQuotedLine(_string6, indent);
-	file->writeNumberLine(_field140, indent);
+	file->writeQuotedLine(_ejectSoundName, indent);
+	file->writeNumberLine(_defaultCursorId, indent);
 
 	CDropTarget::save(file, indent);
 }
@@ -46,13 +55,98 @@ void CRestaurantCylinderHolder::load(SimpleFile *file) {
 	file->readNumber();
 	_field118 = file->readNumber();
 	_field11C = file->readNumber();
-	_string5 = file->readString();
+	_target = file->readString();
 	_field12C = file->readNumber();
 	_field130 = file->readNumber();
-	_string6 = file->readString();
-	_field140 = file->readNumber();
+	_ejectSoundName = file->readString();
+	_defaultCursorId = (CursorId)file->readNumber();
 
 	CDropTarget::load(file);
 }
 
+bool CRestaurantCylinderHolder::EjectCylinderMsg(CEjectCylinderMsg *msg) {
+	_field11C = true;
+	bool hasCylinder = findByName("Phonograph Cylinder") != nullptr;
+
+	if (_field118) {
+		playClip(hasCylinder ? "CloseHolder_Full" : "CloseHolder_Empty",
+			MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+		_fieldF4 = 1;
+	} else {
+		playClip(hasCylinder ? "OpenHolder_Full" : "OpenHolder_Empty",
+			MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
+	}
+
+	playSound(_ejectSoundName, 50);
+	return true;
+}
+
+bool CRestaurantCylinderHolder::EnterViewMsg(CEnterViewMsg *msg) {
+	if (_field118) {
+		CTreeItem *cylinder = findByName("Phonograph Cylinder", true);
+		if (cylinder) {
+			loadFrame(_dropFrame);
+			_cursorId = _dropCursorId;
+		} else {
+			loadFrame(_dragFrame);
+			_cursorId = _dragCursorId;
+		}
+	} else {
+		loadFrame(_field130);
+		_cursorId = _defaultCursorId;
+	}
+
+	return true;
+}
+
+bool CRestaurantCylinderHolder::MovieEndMsg(CMovieEndMsg *msg) {
+	_field11C = false;
+	if (_field118) {
+		_field118 = false;
+		_cursorId = _defaultCursorId;
+
+		CPhonographReadyToPlayMsg readyMsg;
+		readyMsg.execute(_target);
+	} else {
+		_field118 = true;
+		_fieldF4 = false;
+		_cursorId = findByName("Phonograph Cylinder") ? _dropCursorId : _dragCursorId;
+	}
+
+	CCylinderHolderReadyMsg holderMsg;
+	holderMsg.execute(_target);
+	return true;
+}
+
+bool CRestaurantCylinderHolder::QueryCylinderHolderMsg(CQueryCylinderHolderMsg *msg) {
+	CNamedItem *cylinder = findByName("Phonograph Cylinder", true);
+
+	msg->_value1 = _field118;	
+	if (cylinder) {
+		msg->_value2 = 1;
+		msg->_target = cylinder;
+	}
+
+	return true;
+}
+
+bool CRestaurantCylinderHolder::QueryCylinderNameMsg(CQueryCylinderNameMsg *msg) {
+	CNamedItem *cylinder = findByName("Phonograph Cylinder", true);
+
+	if (cylinder) {
+		CQueryCylinderMsg queryMsg;
+		queryMsg.execute(cylinder);
+		msg->_name = queryMsg._name;
+	}
+
+	return true;
+}
+
+bool CRestaurantCylinderHolder::MouseDragStartMsg(CMouseDragStartMsg *msg) {
+	if (_field118)
+		return CDropTarget::MouseDragStartMsg(msg);
+	else
+		return true;
+}
+
 } // End of namespace Titanic