aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/npcs/succubus.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-12-01 21:28:31 -0500
committerPaul Gilbert2016-12-01 21:28:31 -0500
commit3c35ae36d4db1ac036373c3300d4443aee62aad8 (patch)
tree0fae71c7c602278d4318caabf83743b5e5a0bf49 /engines/titanic/npcs/succubus.cpp
parent475289f35a5b4da9737d92bfd0ef3077fbd2943e (diff)
downloadscummvm-rg350-3c35ae36d4db1ac036373c3300d4443aee62aad8.tar.gz
scummvm-rg350-3c35ae36d4db1ac036373c3300d4443aee62aad8.tar.bz2
scummvm-rg350-3c35ae36d4db1ac036373c3300d4443aee62aad8.zip
TITANIC: Fix Succubus greeting message when there's mail
Diffstat (limited to 'engines/titanic/npcs/succubus.cpp')
-rw-r--r--engines/titanic/npcs/succubus.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index 574e999b33..806b144684 100644
--- a/engines/titanic/npcs/succubus.cpp
+++ b/engines/titanic/npcs/succubus.cpp
@@ -526,7 +526,7 @@ bool CSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
if (msg->_endFrame == _endFrame9) {
bool flag = false;
- if (pet && mailExists(petRoomFlags)) {
+ if (pet && !mailExists(petRoomFlags)) {
CGameObject *mailObject = _v3 && compareRoomNameTo("Titania") ?
findMailByFlags(3, petRoomFlags) :
findMailByFlags(_field140, petRoomFlags);
@@ -666,6 +666,7 @@ bool CSuccUBus::TurnOn(CTurnOn *msg) {
uint petRoomFlags = pet->getRoomFlags();
if (mailExists(petRoomFlags) && _endFrame1 >= 0)
+ // Mail canister present
playMovie(_endFrame1, _endFrame1, 0);
_enabled = true;