libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 09:56:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

TITANIC: Fix receiving mail via SuccUBus

Browse Source
This commit is contained in:
Paul Gilbert 2016-12-26 15:58:40 -05:00
parent f48a9fdbf2
commit 98f2adeb2d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/titanic/npcs/succubus.cpp
View File

@ -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("");

2
engines/titanic/room_flags.cpp
View File

@ -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();
}