Skip to content

Commit

Permalink
TTTANIC: Fix bomb narration disappearing after Titania's cutscene
Browse files Browse the repository at this point in the history
  • Loading branch information
dreammaster committed Aug 19, 2017
1 parent dfd8c00 commit 98e0e02
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions engines/titanic/npcs/titania.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit 98e0e02

Please sign in to comment.