From 98e0e023874faa41bb8300a6832b3b1193ecf4ac Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 18 Aug 2017 21:05:01 -0400
Subject: TTTANIC: Fix bomb narration disappearing after Titania's cutscene

---
 engines/titanic/npcs/titania.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'engines/titanic/npcs')

diff --git a/engines/titanic/npcs/titania.cpp b/engines/titanic/npcs/titania.cpp
index 70ca4bace6..887a72de55 100644
--- a/engines/titanic/npcs/titania.cpp
+++ b/engines/titanic/npcs/titania.cpp
@@ -149,9 +149,10 @@ bool CTitania::ActMsg(CActMsg *msg) {
 		playSound("z#47.wav", 100);
 		changeView("Titania.Node 7.S", "");
 
+		// Re-enable control, and reset bomb's volume back to normal 60%
 		petShow();
 		enableMouse();
-		CSetFrameMsg frameMsg;
+		CSetFrameMsg frameMsg(60);
 		frameMsg.execute("Bomb");
 
 	} else if (msg->_action == "CheckHead") {
@@ -203,11 +204,14 @@ bool CTitania::EnterViewMsg(CEnterViewMsg *msg) {
 		disableMouse();
 		petHide();
 
+		// The Bomb uses the CSetFrameMsg as a hack for setting the volume.
+		// In case it's currently active, set it to a quieter 25% so that
+		// it won't obscure Titania's speech.
 		CSetFrameMsg frameMsg;
 		frameMsg._frameNumber = 25;
 		frameMsg.execute("Bomb");
-		playCutscene(0, 52);
 
+		playCutscene(0, 52);
 		setVisible(false);
 		CActMsg actMsg("TitaniaSpeech");
 		actMsg.execute("TitaniaSpeech");
-- 
cgit v1.2.3