TITANIC: Don't allow Titania to activate if you remove parts after ad…

…ding
scummvm · Aug 15, 2017 · 7fa2722 · 7fa2722 · dafioram · Aug 15, 2017
1 parent 970e4b2
commit 7fa2722
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/engines/titanic/carry/head_piece.cpp b/engines/titanic/carry/head_piece.cpp
@@ -64,6 +64,11 @@ bool CHeadPiece::PETGainedObjectMsg(CPETGainedObjectMsg *msg) {
 		_field13C = true;
 	}
 
+	// WORKAROUND: This fixes a bug in the original where if head pieces
+	// were removed from Titania after adding, she would still reactivate
+	CTakeHeadPieceMsg takeMsg(getName());
+	takeMsg.execute("TitaniaControl");
+
 	return true;
 }
 

diff --git a/engines/titanic/npcs/titania.cpp b/engines/titanic/npcs/titania.cpp
@@ -129,7 +129,7 @@ bool CTitania::TakeHeadPieceMsg(CTakeHeadPieceMsg *msg) {
 		_eye2 = false;
 	} else if (msg->_value == "Ear1") {
 		_ear1 = false;
-	} else if (msg->_value == "Ear2") {
+	} else if (msg->_value == "Ear 2") {
 		_ear2 = false;
 	} else if (msg->_value == "Mouth") {
 		_mouth = false;