[Scummvm-git-logs] scummvm master -> ad1bb852eb74c336c84bedf2999c0040bf7a04bd
dreammaster
dreammaster at scummvm.org
Mon Jan 16 01:23:58 CET 2017
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:
ad1bb852eb TITANIC: Fix SuccUBus not eating chicken when it has condiments
Commit: ad1bb852eb74c336c84bedf2999c0040bf7a04bd
https://github.com/scummvm/scummvm/commit/ad1bb852eb74c336c84bedf2999c0040bf7a04bd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-15T19:23:49-05:00
Commit Message:
TITANIC: Fix SuccUBus not eating chicken when it has condiments
Changed paths:
engines/titanic/carry/chicken.cpp
engines/titanic/npcs/succubus.cpp
diff --git a/engines/titanic/carry/chicken.cpp b/engines/titanic/carry/chicken.cpp
index e0ca055..e3577f2 100644
--- a/engines/titanic/carry/chicken.cpp
+++ b/engines/titanic/carry/chicken.cpp
@@ -131,8 +131,7 @@ bool CChicken::ActMsg(CActMsg *msg) {
loadFrame(3);
_field12C = 0;
_visibleFrame = 3;
- }
- else if (msg->_action == "Dispense Chicken") {
+ } else if (msg->_action == "Dispense Chicken") {
_condiment = "None";
_field13C = 0;
_field12C = 1;
diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index 1d8e0e4..b69bfbc 100644
--- a/engines/titanic/npcs/succubus.cpp
+++ b/engines/titanic/npcs/succubus.cpp
@@ -281,7 +281,7 @@ bool CSuccUBus::SubAcceptCCarryMsg(CSubAcceptCCarryMsg *msg) {
pet->phonographAction("");
CChicken *chicken = dynamic_cast<CChicken *>(item);
- bool chickenFlag = chicken ? chicken->_condiment != "None" : false;
+ bool chickenFlag = chicken ? chicken->_condiment == "None" : false;
item->setVisible(false);
if (_startFrame1 >= 0) {
@@ -290,6 +290,7 @@ bool CSuccUBus::SubAcceptCCarryMsg(CSubAcceptCCarryMsg *msg) {
}
if (!chickenFlag) {
+ // Not chicken, or chicken with condiments
_field188 = 1;
item->addMail(roomFlags);
petSetArea(PET_REMOTE);
@@ -297,6 +298,8 @@ bool CSuccUBus::SubAcceptCCarryMsg(CSubAcceptCCarryMsg *msg) {
CSUBTransition transMsg;
transMsg.execute(this);
} else {
+ // Chicken without condiments was passed to SuccUBus, so it'll
+ // eat it immediately
if (_okStartFrame >= 0) {
startTalking(this, 70219, findView());
playMovie(_okStartFrame, _okEndFrame, 0);
More information about the Scummvm-git-logs
mailing list