[Scummvm-git-logs] scummvm master -> af8184d7d90d1ff4e023fc0202d3386147807b2c

[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:
af8184d7d9 TITANIC: Woarkound original bug when SuccUBus eats the chicken


Commit: af8184d7d90d1ff4e023fc0202d3386147807b2c
    https://github.com/scummvm/scummvm/commit/af8184d7d90d1ff4e023fc0202d3386147807b2c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-15T22:46:54-05:00

Commit Message:
TITANIC: Woarkound original bug when SuccUBus eats the chicken

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


diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index b69bfbc..3534ba0 100644
--- a/engines/titanic/npcs/succubus.cpp
+++ b/engines/titanic/npcs/succubus.cpp
@@ -310,15 +310,22 @@ bool CSuccUBus::SubAcceptCCarryMsg(CSubAcceptCCarryMsg *msg) {
 				_field158 = 2;
 			}
 
+			// WORKAROUND: The original had code below to return the chicken
+			// to the dispensor after eaten, but since _fullViewName isn't
+			// set, it didn't work. I've added code below in the else block
+			// that replicates what happens when the parrot eats the chicken
 			CViewItem *view = parseView(chicken->_fullViewName);
-			if (!view)
-				return false;
-
-			item->setPosition(item->_origPos);
-			item->moveUnder(view);
+			if (view) {
+				item->setPosition(item->_origPos);
+				item->moveUnder(view);
 
-			CSUBTransition transMsg;
-			transMsg.execute(this);
+				CSUBTransition transMsg;
+				transMsg.execute(this);
+			} else {
+				CActMsg actMsg("Eaten");
+				actMsg.execute(chicken);
+				return false;
+			}
 		}
 	}