diff options
| author | Paul Gilbert | 2016-12-01 20:22:37 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-12-01 20:22:37 -0500 |
| commit | 475289f35a5b4da9737d92bfd0ef3077fbd2943e (patch) | |
| tree | 8ea59302ac25fc0497b45ba01d3902ddbdd95913 /engines/titanic/npcs/succubus.cpp | |
| parent | 94e2c674186744db55f548032f889f8e122b9c97 (diff) | |
| download | scummvm-rg350-475289f35a5b4da9737d92bfd0ef3077fbd2943e.tar.gz scummvm-rg350-475289f35a5b4da9737d92bfd0ef3077fbd2943e.tar.bz2 scummvm-rg350-475289f35a5b4da9737d92bfd0ef3077fbd2943e.zip | |
TITANIC: Renamings and clarifications for mail methods
Diffstat (limited to 'engines/titanic/npcs/succubus.cpp')
| -rw-r--r-- | engines/titanic/npcs/succubus.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp index cb73eba490..574e999b33 100644 --- a/engines/titanic/npcs/succubus.cpp +++ b/engines/titanic/npcs/succubus.cpp @@ -378,7 +378,8 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { if (!pet) return true; - CGameObject *mailObject = findMail(pet->getRoomFlags()); + uint destRoomFlags = pet->getRoomFlags(); + CGameObject *mailObject = findMail(destRoomFlags); if (!mailObject) { switch (getRandomNumber(2)) { case 0: @@ -415,7 +416,7 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { if (_isFeathers) { _field19C = 0; - removeMail(roomFlags, roomFlags); + removeMail(destRoomFlags, roomFlags); pet->phonographAction(""); if (_startFrame2 >= 0) { @@ -609,7 +610,7 @@ bool CSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { if (msg->_endFrame == _endFrame4) { if (pet && _mailP) { - _mailP->setMailId(petRoomFlags); + _mailP->setMailDest(petRoomFlags); } _field188 = 1; @@ -726,7 +727,7 @@ bool CSuccUBus::SUBTransition(CSUBTransition *msg) { bool CSuccUBus::SetChevRoomBits(CSetChevRoomBits *msg) { if (_enabled) { - _roomFlags = msg->_roomNum; + _roomFlags = msg->_roomFlags; playSound("z#98.wav", 100); } |