[Scummvm-git-logs] scummvm master -> 78ed19d42986c2fb2f310476196963ba6709010f

[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:
78ed19d429 TITANIC: Disable fix for dispensed chickens' initial temperature


Commit: 78ed19d42986c2fb2f310476196963ba6709010f
    https://github.com/scummvm/scummvm/commit/78ed19d42986c2fb2f310476196963ba6709010f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-23T22:43:10-04:00

Commit Message:
TITANIC: Disable fix for dispensed chickens' initial temperature

The original had a bug that didn't dispense chickens as cold when
the yellow fuse was removed from the fusebox. Too many walkthroughs
suggest removing it though, so I'm disabling fix to avoid confusion.

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


diff --git a/engines/titanic/game/chicken_dispensor.cpp b/engines/titanic/game/chicken_dispensor.cpp
index d44bc71..692c364 100644
--- a/engines/titanic/game/chicken_dispensor.cpp
+++ b/engines/titanic/game/chicken_dispensor.cpp
@@ -113,11 +113,13 @@ bool CChickenDispensor::MovieEndMsg(CMovieEndMsg *msg) {
 		CActMsg actMsg("Dispense Chicken");
 		actMsg.execute("Chicken");
 
+		#ifdef FIX_DISPENSOR_TEMPATURE
 		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;
 		}
+		#endif
 	} else if (_dispensed) {
 		// Chicken dispensed whilst dispensor is "disabled", which basically
 		// spits the chicken out at high speed directly into the SuccUBus
diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h
index 0c15cf3..4742f51 100644
--- a/engines/titanic/titanic.h
+++ b/engines/titanic/titanic.h
@@ -74,6 +74,12 @@ enum TitanicDebugChannels {
 
 #define SOUND(enName, deName) (g_vm->isGerman() ? deName : enName)
 
+// If enabled, fixes an original bug where dispensed chickens weren't
+// meant to be hot unless the Yellow fuse was left in the Fusebox.
+// This is being left disabled for now, since most walkthroughs for
+// the game redundantly suggest removing the fuse, which is wrong
+//#define FIX_DISPENSOR_TEMPATURE
+
 struct TitanicGameDescription;
 class TitanicEngine;