aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2017-08-23 22:43:10 -0400
committerPaul Gilbert2017-08-23 22:43:10 -0400
commit78ed19d42986c2fb2f310476196963ba6709010f (patch)
tree59babbf853d0b29cf936a62fa402eaa976231386 /engines
parenta2a980aa89ee7a9bf60085f020c9ee37385152d8 (diff)
downloadscummvm-rg350-78ed19d42986c2fb2f310476196963ba6709010f.tar.gz
scummvm-rg350-78ed19d42986c2fb2f310476196963ba6709010f.tar.bz2
scummvm-rg350-78ed19d42986c2fb2f310476196963ba6709010f.zip
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.
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/game/chicken_dispensor.cpp2
-rw-r--r--engines/titanic/titanic.h6
2 files changed, 8 insertions, 0 deletions
diff --git a/engines/titanic/game/chicken_dispensor.cpp b/engines/titanic/game/chicken_dispensor.cpp
index d44bc7157b..692c364918 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 0c15cf3e72..4742f51d82 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;