[Scummvm-git-logs] scummvm master -> 13466bb69245291a6c246ecbd58836bf5c36aef4

[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:
13466bb692 TITANIC: Correct local variable name in SuccUBus


Commit: 13466bb69245291a6c246ecbd58836bf5c36aef4
    https://github.com/scummvm/scummvm/commit/13466bb69245291a6c246ecbd58836bf5c36aef4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-06T18:54:38-04:00

Commit Message:
TITANIC: Correct local variable name in SuccUBus

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


diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index ef681f6..1155eb0 100644
--- a/engines/titanic/npcs/succubus.cpp
+++ b/engines/titanic/npcs/succubus.cpp
@@ -385,9 +385,10 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) {
 	if (!pet)
 		return true;
 
-	uint destRoomFlags = pet->getRoomFlags();
-	CGameObject *mailObject = findMail(destRoomFlags);
+	uint srcRoomFlags = pet->getRoomFlags();
+	CGameObject *mailObject = findMail(srcRoomFlags);
 	if (!mailObject) {
+		// Nothing to send
 		switch (getRandomNumber(2)) {
 		case 0:
 			startTalking(this, 70111, findView());
@@ -422,7 +423,7 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) {
 		if (_isFeathers) {
 			// The feather has special handling to be rejected by the SuccUBus
 			_sendLost = false;
-			sendMail(destRoomFlags, roomFlags);
+			sendMail(srcRoomFlags, roomFlags);
 			pet->phonographAction("");
 
 			if (_okStartFrame >= 0) {