diff options
author | Paul Gilbert | 2016-12-26 15:45:52 -0500 |
---|---|---|
committer | Paul Gilbert | 2016-12-26 15:45:52 -0500 |
commit | f48a9fdbf25796a50e0bc755f82ebb06c461e1b6 (patch) | |
tree | c198cfad0819ecbf2d65161055806a99d9b9b321 /engines/titanic/core/mail_man.cpp | |
parent | 170a1a33e7940fc98a08ae5009770b11ea9e1de9 (diff) | |
download | scummvm-rg350-f48a9fdbf25796a50e0bc755f82ebb06c461e1b6.tar.gz scummvm-rg350-f48a9fdbf25796a50e0bc755f82ebb06c461e1b6.tar.bz2 scummvm-rg350-f48a9fdbf25796a50e0bc755f82ebb06c461e1b6.zip |
TITANIC: Clarifications to sending mail code
Diffstat (limited to 'engines/titanic/core/mail_man.cpp')
-rw-r--r-- | engines/titanic/core/mail_man.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/titanic/core/mail_man.cpp b/engines/titanic/core/mail_man.cpp index 851e52694d..a34c69674b 100644 --- a/engines/titanic/core/mail_man.cpp +++ b/engines/titanic/core/mail_man.cpp @@ -56,22 +56,22 @@ void CMailMan::addMail(CGameObject *obj, uint destRoomFlags) { void CMailMan::setMailDest(CGameObject *obj, uint roomFlags) { obj->_destRoomFlags = roomFlags; obj->_roomFlags = 0; - obj->_isMail = true; + obj->_isPendingMail = true; } CGameObject *CMailMan::findMail(uint roomFlags) const { for (CGameObject *obj = getFirstObject(); obj; obj = getNextObject(obj)) { - if (obj->_isMail && obj->_destRoomFlags == roomFlags) + if (obj->_isPendingMail && obj->_destRoomFlags == roomFlags) return obj; } return nullptr; } -void CMailMan::removeMail(uint destRoomFlags, uint newRoomFlags) { +void CMailMan::sendMail(uint currRoomFlags, uint newRoomFlags) { for (CGameObject *obj = getFirstObject(); obj; obj = getNextObject(obj)) { - if (obj->_isMail && obj->_destRoomFlags == destRoomFlags) { - obj->_isMail = false; + if (obj->_isPendingMail && obj->_destRoomFlags == currRoomFlags) { + obj->_isPendingMail = false; obj->_roomFlags = newRoomFlags; break; } |