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

[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:
a21e8b9de2 TITANIC: Fix getting chicken after not picking up a previous one


Commit: a21e8b9de2e4404ba10b01ddb3e87dd31e4a0895
    https://github.com/scummvm/scummvm/commit/a21e8b9de2e4404ba10b01ddb3e87dd31e4a0895
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-19T20:30:43-04:00

Commit Message:
TITANIC: Fix getting chicken after not picking up a previous one

When you dispense a chicken, but don't pick it up and leave, the
chicken is returned to the dispensor. But previously you couldn't
then get another chicken, though you should be able to get one.

Changed paths:
    engines/titanic/game/chicken_dispensor.cpp


diff --git a/engines/titanic/game/chicken_dispensor.cpp b/engines/titanic/game/chicken_dispensor.cpp
index 89873dc..d44bc71 100644
--- a/engines/titanic/game/chicken_dispensor.cpp
+++ b/engines/titanic/game/chicken_dispensor.cpp
@@ -104,7 +104,7 @@ bool CChickenDispensor::StatusChangeMsg(CStatusChangeMsg *msg) {
 }
 
 bool CChickenDispensor::MovieEndMsg(CMovieEndMsg *msg) {
-	int movieFrame = getMovieFrame();
+	int movieFrame = msg->_endFrame;
 	
 	if (movieFrame == 16) {
 		// Dispensed a chicken
@@ -113,12 +113,7 @@ bool CChickenDispensor::MovieEndMsg(CMovieEndMsg *msg) {
 		CActMsg actMsg("Dispense Chicken");
 		actMsg.execute("Chicken");
 
-		if (_dispenseMode == DISPENSE_HOT) {
-			// A properly hot chicken is dispensed, no further ones will be
-			// until the current one is used up, and the fuse in Titania's
-			// fusebox is removed and replaced
-			_dispenseMode = DISPENSE_NONE;
-		} else {
+		if (_dispenseMode != DISPENSE_HOT) {
 			// WORKAROUND: If the fuse for the dispensor is removed in Titania's fusebox,
 			// make the dispensed chicken already cold
 			CChicken::_temperature = 0;