[Scummvm-git-logs] scummvm master -> 98f2adeb2d2289c643b3757eb1bc2d6cea63edb6

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
98f2adeb2d TITANIC: Fix receiving mail via SuccUBus


Commit: 98f2adeb2d2289c643b3757eb1bc2d6cea63edb6
    https://github.com/scummvm/scummvm/commit/98f2adeb2d2289c643b3757eb1bc2d6cea63edb6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-26T15:58:40-05:00

Commit Message:
TITANIC: Fix receiving mail via SuccUBus

Changed paths:
    engines/titanic/npcs/succubus.cpp
    engines/titanic/room_flags.cpp


diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index af21c7b..dd07513 100644
--- a/engines/titanic/npcs/succubus.cpp
+++ b/engines/titanic/npcs/succubus.cpp
@@ -413,6 +413,7 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) {
 		incTransitions();
 
 		if (_isFeathers) {
+			// The feather has special handling to be rejected by the SuccUBus
 			_sendLost = false;
 			sendMail(destRoomFlags, roomFlags);
 			pet->phonographAction("");
@@ -435,6 +436,7 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) {
 				playMovie(_afterReceiveStartFrame, _afterReceiveEndFrame, 0);
 			}
 		} else {
+			// Send the mail to the destination
 			sendMail(pet->getRoomFlags(), roomFlags);
 			pet->phonographAction("");
 
diff --git a/engines/titanic/room_flags.cpp b/engines/titanic/room_flags.cpp
index 4bd1862..57156f0 100644
--- a/engines/titanic/room_flags.cpp
+++ b/engines/titanic/room_flags.cpp
@@ -472,7 +472,7 @@ bool CRoomFlags::compareLocation(uint flags1, uint flags2) {
 	CRoomFlags f1(flags1);
 	CRoomFlags f2(flags2);
 
-	return f1.getElevatorNum() == f2.getElevatorBits() &&
+	return f1.getElevatorNum() == f2.getElevatorNum() &&
 		f1.getFloorNum() == f2.getFloorNum() &&
 		f1.getRoomNum() == f2.getRoomNum();
 }