[Scummvm-git-logs] scummvm master -> 7fa272237240818df38a0e71e0068fec83c8eebc

[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:
7fa2722372 TITANIC: Don't allow Titania to activate if you remove parts after adding


Commit: 7fa272237240818df38a0e71e0068fec83c8eebc
    https://github.com/scummvm/scummvm/commit/7fa272237240818df38a0e71e0068fec83c8eebc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-14T20:14:37-04:00

Commit Message:
TITANIC: Don't allow Titania to activate if you remove parts after adding

Changed paths:
    engines/titanic/carry/head_piece.cpp
    engines/titanic/npcs/titania.cpp


diff --git a/engines/titanic/carry/head_piece.cpp b/engines/titanic/carry/head_piece.cpp
index fa02515..42024fe 100644
--- 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
index 2b6536f..70ca4ba 100644
--- 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;