[Scummvm-git-logs] scummvm master -> 98e0e023874faa41bb8300a6832b3b1193ecf4ac
dreammaster
dreammaster at scummvm.org
Sat Aug 19 03:05:06 CEST 2017
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:
98e0e02387 TTTANIC: Fix bomb narration disappearing after Titania's cutscene
Commit: 98e0e023874faa41bb8300a6832b3b1193ecf4ac
https://github.com/scummvm/scummvm/commit/98e0e023874faa41bb8300a6832b3b1193ecf4ac
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-18T21:05:01-04:00
Commit Message:
TTTANIC: Fix bomb narration disappearing after Titania's cutscene
Changed paths:
engines/titanic/npcs/titania.cpp
diff --git a/engines/titanic/npcs/titania.cpp b/engines/titanic/npcs/titania.cpp
index 70ca4ba..887a72d 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");
More information about the Scummvm-git-logs
mailing list