TITANIC: Fix adding centre cards to Titania

1 files changed, 17 insertions, 20 deletions

diff --git a/engines/titanic/carry/brain.cpp b/engines/titanic/carry/brain.cpp
index 7b2e8d0e45..49178d1e10 100644
--- a/engines/titanic/carry/brain.cpp
+++ b/engines/titanic/carry/brain.cpp
@@ -56,28 +56,25 @@ void CBrain::load(SimpleFile *file) {
 
 bool CBrain::UseWithOtherMsg(CUseWithOtherMsg *msg) {
 	CBrainSlot *slot = dynamic_cast<CBrainSlot *>(msg->_other);
-	if (slot) {
-		if (slot->getName() == "CentralCore") {
-			setVisible(false);
-			petMoveToHiddenRoom();
-			CAddHeadPieceMsg headpieceMsg(getName());
-			headpieceMsg.execute("CentralCoreSlot");
-		}
-		else if (!slot->_value1 && slot->getName() == "CentralCoreSlot") {
-			setVisible(false);
-			petMoveToHiddenRoom();
-			CAddHeadPieceMsg headpieceMsg(getName());
-			headpieceMsg.execute(msg->_other);
-			playSound("z#116.wav");
-			setPosition(Point(0, 0));
-			setVisible(false);
-			_field134 = 1;
-		}
-
-		return true;
-	} else {
+	if (!slot) {
 		return CCarry::UseWithOtherMsg(msg);
+	} else if (isEquals("CentralCore")) {
+		setVisible(false);
+		petMoveToHiddenRoom();
+		CAddHeadPieceMsg headpieceMsg(getName());
+		headpieceMsg.execute("CentralCoreSlot");
+	} else if (!slot->_occupied && slot->getName() != "CentralCoreSlot") {
+		setVisible(false);
+		petMoveToHiddenRoom();
+		CAddHeadPieceMsg headpieceMsg(getName());
+		headpieceMsg.execute(msg->_other);
+		playSound("z#116.wav");
+		setPosition(Point(0, 0));
+		setVisible(false);
+		_field134 = 1;
 	}
+
+	return true;
 }
 
 bool CBrain::VisibleMsg(CVisibleMsg *msg) {