diff options
| author | Paul Gilbert | 2016-12-26 15:58:40 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-12-26 15:58:40 -0500 |
| commit | 98f2adeb2d2289c643b3757eb1bc2d6cea63edb6 (patch) | |
| tree | 00e447dda38e71f5b2aff50caeed8c5c46305e26 /engines | |
| parent | f48a9fdbf25796a50e0bc755f82ebb06c461e1b6 (diff) | |
| download | scummvm-rg350-98f2adeb2d2289c643b3757eb1bc2d6cea63edb6.tar.gz scummvm-rg350-98f2adeb2d2289c643b3757eb1bc2d6cea63edb6.tar.bz2 scummvm-rg350-98f2adeb2d2289c643b3757eb1bc2d6cea63edb6.zip | |
TITANIC: Fix receiving mail via SuccUBus
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/npcs/succubus.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/room_flags.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp index af21c7b758..dd075139a8 100644 --- a/engines/titanic/npcs/succubus.cpp +++ b/engines/titanic/npcs/succubus.cpp @@ -413,6 +413,7 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { incTransitions(); if (_isFeathers) { + // The feather has special handling to be rejected by the SuccUBus _sendLost = false; sendMail(destRoomFlags, roomFlags); pet->phonographAction(""); @@ -435,6 +436,7 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { playMovie(_afterReceiveStartFrame, _afterReceiveEndFrame, 0); } } else { + // Send the mail to the destination sendMail(pet->getRoomFlags(), roomFlags); pet->phonographAction(""); diff --git a/engines/titanic/room_flags.cpp b/engines/titanic/room_flags.cpp index 4bd186238f..57156f0655 100644 --- a/engines/titanic/room_flags.cpp +++ b/engines/titanic/room_flags.cpp @@ -472,7 +472,7 @@ bool CRoomFlags::compareLocation(uint flags1, uint flags2) { CRoomFlags f1(flags1); CRoomFlags f2(flags2); - return f1.getElevatorNum() == f2.getElevatorBits() && + return f1.getElevatorNum() == f2.getElevatorNum() && f1.getFloorNum() == f2.getFloorNum() && f1.getRoomNum() == f2.getRoomNum(); } |