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

[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:
af3a0a4255 TITANIC: Fix Bilge SuccUBus activation speech


Commit: af3a0a42559e8b7bfbf6a76763e2d4c064ec5a8f
    https://github.com/scummvm/scummvm/commit/af3a0a42559e8b7bfbf6a76763e2d4c064ec5a8f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-28T16:54:46-05:00

Commit Message:
TITANIC: Fix Bilge SuccUBus activation speech

Changed paths:
    engines/titanic/npcs/bilge_succubus.cpp


diff --git a/engines/titanic/npcs/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp
index f2b1634..7ce361d 100644
--- a/engines/titanic/npcs/bilge_succubus.cpp
+++ b/engines/titanic/npcs/bilge_succubus.cpp
@@ -187,7 +187,7 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
 		if (_startFrame11 >= 0)
 			playSound("z#30.wav");
 	} else {
-		if (_onEndFrame == _offEndFrame && pet) {
+		if (msg->_endFrame == _onEndFrame && pet) {
 			if (_v2) {
 				startTalking(this, getRandomNumber(1) ? 230062 : 230063);
 			} else if (!findMail(pet->getRoomFlags())) {
@@ -205,9 +205,8 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
 					break;
 				}
 			}
-		}
 
-		if (msg->_endFrame == _sendEndFrame) {
+		} else if (msg->_endFrame == _sendEndFrame) {
 			switch (_field158) {
 			case 1:
 				stopSound(_soundHandle);