aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/npcs
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-15 11:42:58 -0500
committerPaul Gilbert2017-01-15 11:42:58 -0500
commit3327b9ce8dd030e963d03a98de63def7344e1808 (patch)
treed2c7608391e62a85f6c5d0097f487153faaca769 /engines/titanic/npcs
parent03765dbf183e0cea8bc5edbd336f2be280d6df43 (diff)
downloadscummvm-rg350-3327b9ce8dd030e963d03a98de63def7344e1808.tar.gz
scummvm-rg350-3327b9ce8dd030e963d03a98de63def7344e1808.tar.bz2
scummvm-rg350-3327b9ce8dd030e963d03a98de63def7344e1808.zip
TITANIC: Fix using chicken on dispensors
Diffstat (limited to 'engines/titanic/npcs')
-rw-r--r--engines/titanic/npcs/bilge_succubus.cpp2
-rw-r--r--engines/titanic/npcs/succubus.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/npcs/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp
index 36627842a5..628f2eb24b 100644
--- a/engines/titanic/npcs/bilge_succubus.cpp
+++ b/engines/titanic/npcs/bilge_succubus.cpp
@@ -337,7 +337,7 @@ bool CBilgeSuccUBus::SubAcceptCCarryMsg(CSubAcceptCCarryMsg *msg) {
playSound("z#23.wav");
CChicken *chicken = dynamic_cast<CChicken *>(item);
- bool chickenFlag = chicken ? chicken->_string6 == "None" : false;
+ bool chickenFlag = chicken ? chicken->_condiment == "None" : false;
if (chickenFlag) {
if (_okStartFrame >= 0) {
diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index a05cc71d00..1d8e0e4f13 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->_string6 != "None" : false;
+ bool chickenFlag = chicken ? chicken->_condiment != "None" : false;
item->setVisible(false);
if (_startFrame1 >= 0) {