diff options
| author | Paul Gilbert | 2016-12-25 23:54:00 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-12-25 23:54:00 -0500 |
| commit | 81cb0f11dbad5e1744807a926f245c4b2e8307be (patch) | |
| tree | d88864528ce5aeb25ebac1450594a988377f9b4e /engines/titanic/npcs/bilge_succubus.cpp | |
| parent | 9755109fddf1da1da1e3322823aa212447f85d14 (diff) | |
| download | scummvm-rg350-81cb0f11dbad5e1744807a926f245c4b2e8307be.tar.gz scummvm-rg350-81cb0f11dbad5e1744807a926f245c4b2e8307be.tar.bz2 scummvm-rg350-81cb0f11dbad5e1744807a926f245c4b2e8307be.zip | |
TITANIC: Cleanup and fixes for class checks when SuccUBus sucking
Diffstat (limited to 'engines/titanic/npcs/bilge_succubus.cpp')
| -rw-r--r-- | engines/titanic/npcs/bilge_succubus.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/titanic/npcs/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp index 53cf963de7..01d80beb44 100644 --- a/engines/titanic/npcs/bilge_succubus.cpp +++ b/engines/titanic/npcs/bilge_succubus.cpp @@ -116,14 +116,13 @@ bool CBilgeSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { return true; } - _field19C = 0; + _sendLost = false; _mailP = mailObject; uint roomFlags = _roomFlags; - if (!pet->testRooms5(roomFlags) || - getPassengerClass() > pet->getMailDest(roomFlags)) { + if (!pet->isSuccUBusDest(roomFlags) || pet->getMailDestClass(roomFlags) < getPassengerClass()) { roomFlags = pet->getSpecialRoomFlags("BilgeRoom"); - _field19C = 1; + _sendLost = true; } _isChicken = mailObject->getName() == "Chicken"; |