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/pet_control | |
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/pet_control')
-rw-r--r-- | engines/titanic/pet_control/pet_drag_chev.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_rooms.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_rooms_glyphs.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/pet_control/pet_drag_chev.cpp b/engines/titanic/pet_control/pet_drag_chev.cpp index 4fe64283ff..957fe5295c 100644 --- a/engines/titanic/pet_control/pet_drag_chev.cpp +++ b/engines/titanic/pet_control/pet_drag_chev.cpp @@ -57,7 +57,7 @@ bool CPetDragChev::MouseDragEndMsg(CMouseDragEndMsg *msg) { CSuccUBus *succubus = dynamic_cast<CSuccUBus *>(msg->_dropTarget); if (succubus) { - CSetChevRoomBits chevMsg(_id); + CSetChevRoomBits chevMsg(_destRoomFlags); chevMsg.execute(succubus); } else { CPetControl *petControl = getPetControl(); diff --git a/engines/titanic/pet_control/pet_rooms.cpp b/engines/titanic/pet_control/pet_rooms.cpp index 6930ecab9d..ebf8381eed 100644 --- a/engines/titanic/pet_control/pet_rooms.cpp +++ b/engines/titanic/pet_control/pet_rooms.cpp @@ -101,7 +101,7 @@ bool CPetRooms::checkDragEnd(CGameObject *item) { if (!item->_isMail) return false; - uint roomFlags = item->_id; + uint roomFlags = item->_destRoomFlags; CPetRoomsGlyph *glyph = _glyphs.findGlyphByFlags(roomFlags); if (glyph) { if (_glyphs.findGlyphByFlags(0)) { diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.cpp b/engines/titanic/pet_control/pet_rooms_glyphs.cpp index f38ed28a80..e911759f25 100644 --- a/engines/titanic/pet_control/pet_rooms_glyphs.cpp +++ b/engines/titanic/pet_control/pet_rooms_glyphs.cpp @@ -123,7 +123,7 @@ bool CPetRoomsGlyph::dragGlyph(const Point &topLeft, CMouseDragStartMsg *msg) { CGameObject *chevron = petControl->getHiddenObject("3PetChevron"); if (chevron) { - chevron->_id = _roomFlags; + chevron->_destRoomFlags = _roomFlags; chevron->_isMail = _mailFlag != 0; petControl->removeFromInventory(chevron, false, false); chevron->loadSurface(); |