[Scummvm-git-logs] scummvm master -> 8512476a0813f4c3fdfbb4b645abb43570fbfab5

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8512476a08 TITANIC: Don't allow cylinders to be dropped in music system slot closed


Commit: 8512476a0813f4c3fdfbb4b645abb43570fbfab5
    https://github.com/scummvm/scummvm/commit/8512476a0813f4c3fdfbb4b645abb43570fbfab5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-25T17:06:56-04:00

Commit Message:
TITANIC: Don't allow cylinders to be dropped in music system slot closed

Changed paths:
    engines/titanic/game/restaurant_cylinder_holder.cpp
    engines/titanic/game/restaurant_cylinder_holder.h


diff --git a/engines/titanic/game/restaurant_cylinder_holder.cpp b/engines/titanic/game/restaurant_cylinder_holder.cpp
index eddd4d2..1a7d10f 100644
--- a/engines/titanic/game/restaurant_cylinder_holder.cpp
+++ b/engines/titanic/game/restaurant_cylinder_holder.cpp
@@ -31,6 +31,7 @@ BEGIN_MESSAGE_MAP(CRestaurantCylinderHolder, CDropTarget)
 	ON_MESSAGE(QueryCylinderHolderMsg)
 	ON_MESSAGE(QueryCylinderNameMsg)
 	ON_MESSAGE(MouseDragStartMsg)
+	ON_MESSAGE(DropObjectMsg)
 END_MESSAGE_MAP()
 
 CRestaurantCylinderHolder::CRestaurantCylinderHolder() : CDropTarget(),
@@ -149,4 +150,11 @@ bool CRestaurantCylinderHolder::MouseDragStartMsg(CMouseDragStartMsg *msg) {
 		return true;
 }
 
+bool CRestaurantCylinderHolder::DropObjectMsg(CDropObjectMsg *msg) {
+	if (_isOpen)
+		return CDropTarget::DropObjectMsg(msg);
+	else
+		return false;
+}
+
 } // End of namespace Titanic
diff --git a/engines/titanic/game/restaurant_cylinder_holder.h b/engines/titanic/game/restaurant_cylinder_holder.h
index 7be73df..63f9ccd 100644
--- a/engines/titanic/game/restaurant_cylinder_holder.h
+++ b/engines/titanic/game/restaurant_cylinder_holder.h
@@ -35,6 +35,7 @@ class CRestaurantCylinderHolder : public CDropTarget {
 	bool QueryCylinderHolderMsg(CQueryCylinderHolderMsg *msg);
 	bool QueryCylinderNameMsg(CQueryCylinderNameMsg *msg);
 	bool MouseDragStartMsg(CMouseDragStartMsg *msg);
+	bool DropObjectMsg(CDropObjectMsg *msg);
 private:
 	bool _isOpen;
 	int _field11C;