aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2017-08-25 17:06:56 -0400
committerPaul Gilbert2017-08-25 17:06:56 -0400
commit8512476a0813f4c3fdfbb4b645abb43570fbfab5 (patch)
tree3d6027a3cbb32580214c68079276bb44108c76f0 /engines
parent853ad19934b83a054611732a9a5a243019d42cc1 (diff)
downloadscummvm-rg350-8512476a0813f4c3fdfbb4b645abb43570fbfab5.tar.gz
scummvm-rg350-8512476a0813f4c3fdfbb4b645abb43570fbfab5.tar.bz2
scummvm-rg350-8512476a0813f4c3fdfbb4b645abb43570fbfab5.zip
TITANIC: Don't allow cylinders to be dropped in music system slot closed
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/game/restaurant_cylinder_holder.cpp8
-rw-r--r--engines/titanic/game/restaurant_cylinder_holder.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/engines/titanic/game/restaurant_cylinder_holder.cpp b/engines/titanic/game/restaurant_cylinder_holder.cpp
index eddd4d2288..1a7d10f1cf 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 7be73df074..63f9ccd9eb 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;