[Scummvm-git-logs] scummvm master -> c4f48f35c6ed399dbd1930589c55b4135fc327b4

[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:
c4f48f35c6 TITANIC: Fix flagging of mouth and vision centre inserting in Titania


Commit: c4f48f35c6ed399dbd1930589c55b4135fc327b4
    https://github.com/scummvm/scummvm/commit/c4f48f35c6ed399dbd1930589c55b4135fc327b4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-19T22:44:25-04:00

Commit Message:
TITANIC: Fix flagging of mouth and vision centre inserting in Titania

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


diff --git a/engines/titanic/carry/mouth.cpp b/engines/titanic/carry/mouth.cpp
index d750fc9..1b2830b 100644
--- a/engines/titanic/carry/mouth.cpp
+++ b/engines/titanic/carry/mouth.cpp
@@ -74,6 +74,11 @@ bool CMouth::PETGainedObjectMsg(CPETGainedObjectMsg *msg) {
 		_field13C = true;
 	}
 
+	// WORKAROUND: If Mouth is removed from Titania after inserting,
+	// message the Titania control so it can be flagged as removed
+	CTakeHeadPieceMsg headpieceMsg(getName());
+	headpieceMsg.execute("TitaniaControl");
+
 	return true;
 }
 
diff --git a/engines/titanic/npcs/titania.cpp b/engines/titanic/npcs/titania.cpp
index 887a72d..d3e3395 100644
--- a/engines/titanic/npcs/titania.cpp
+++ b/engines/titanic/npcs/titania.cpp
@@ -174,8 +174,9 @@ bool CTitania::ActMsg(CActMsg *msg) {
 			workingMsg3._value = _speechCentre ? "Working" : "Random";
 		}
 
-		if (_centralCore && _eye1 && _eye2 && _ear1 && _ear2 && _nose && _mouth
-				&& _speechCentre && _olfactoryCentre && _auditoryCentre) {
+		if (_centralCore && _eye1 && _eye2 && _ear1 && _ear2 && _nose
+				&& _mouth && _visionCentre && _speechCentre
+				&& _olfactoryCentre && _auditoryCentre) {
 			CProximity prox(Audio::Mixer::kSpeechSoundType);
 			playSound("z#47.wav", prox);