aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/pet_control
diff options
context:
space:
mode:
authorPaul Gilbert2016-12-26 15:45:52 -0500
committerPaul Gilbert2016-12-26 15:45:52 -0500
commitf48a9fdbf25796a50e0bc755f82ebb06c461e1b6 (patch)
treec198cfad0819ecbf2d65161055806a99d9b9b321 /engines/titanic/pet_control
parent170a1a33e7940fc98a08ae5009770b11ea9e1de9 (diff)
downloadscummvm-rg350-f48a9fdbf25796a50e0bc755f82ebb06c461e1b6.tar.gz
scummvm-rg350-f48a9fdbf25796a50e0bc755f82ebb06c461e1b6.tar.bz2
scummvm-rg350-f48a9fdbf25796a50e0bc755f82ebb06c461e1b6.zip
TITANIC: Clarifications to sending mail code
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r--engines/titanic/pet_control/pet_rooms.cpp4
-rw-r--r--engines/titanic/pet_control/pet_rooms_glyphs.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/pet_control/pet_rooms.cpp b/engines/titanic/pet_control/pet_rooms.cpp
index f8017373ec..c00a7ca811 100644
--- a/engines/titanic/pet_control/pet_rooms.cpp
+++ b/engines/titanic/pet_control/pet_rooms.cpp
@@ -97,8 +97,8 @@ bool CPetRooms::VirtualKeyCharMsg(CVirtualKeyCharMsg *msg) {
}
bool CPetRooms::checkDragEnd(CGameObject *item) {
- // Ignore any item drops except valid mail items
- if (!item->_isMail)
+ // Ignore any item drops except onto mail items
+ if (!item->_isPendingMail)
return false;
uint roomFlags = item->_destRoomFlags;
diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.cpp b/engines/titanic/pet_control/pet_rooms_glyphs.cpp
index 1df4a0efac..2197713fa1 100644
--- a/engines/titanic/pet_control/pet_rooms_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_rooms_glyphs.cpp
@@ -124,7 +124,7 @@ bool CPetRoomsGlyph::dragGlyph(const Point &topLeft, CMouseDragStartMsg *msg) {
if (chevron) {
chevron->_destRoomFlags = _roomFlags;
- chevron->_isMail = _mailFlag != 0;
+ chevron->_isPendingMail = _mailFlag != 0;
petControl->removeFromInventory(chevron, false, false);
chevron->loadSurface();