aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game
diff options
context:
space:
mode:
Diffstat (limited to 'engines/titanic/game')
-rw-r--r--engines/titanic/game/bowl_unlocker.cpp2
-rw-r--r--engines/titanic/game/ear_sweet_bowl.cpp2
-rw-r--r--engines/titanic/game/empty_nut_bowl.cpp2
-rw-r--r--engines/titanic/game/no_nut_bowl.cpp2
-rw-r--r--engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp4
-rw-r--r--engines/titanic/game/parrot/parrot_nut_eater.cpp2
6 files changed, 7 insertions, 7 deletions
diff --git a/engines/titanic/game/bowl_unlocker.cpp b/engines/titanic/game/bowl_unlocker.cpp
index c4adac34f2..06d70256c5 100644
--- a/engines/titanic/game/bowl_unlocker.cpp
+++ b/engines/titanic/game/bowl_unlocker.cpp
@@ -45,7 +45,7 @@ void CBowlUnlocker::load(SimpleFile *file) {
}
bool CBowlUnlocker::NutPuzzleMsg(CNutPuzzleMsg *msg) {
- if (msg->_value == "UnlockBowl") {
+ if (msg->_action == "UnlockBowl") {
setVisible(true);
playMovie(MOVIE_NOTIFY_OBJECT);
}
diff --git a/engines/titanic/game/ear_sweet_bowl.cpp b/engines/titanic/game/ear_sweet_bowl.cpp
index 646b95f0b4..5c41ba4dfe 100644
--- a/engines/titanic/game/ear_sweet_bowl.cpp
+++ b/engines/titanic/game/ear_sweet_bowl.cpp
@@ -53,7 +53,7 @@ bool CEarSweetBowl::MovieEndMsg(CMovieEndMsg *msg) {
CIsParrotPresentMsg parrotMsg;
parrotMsg.execute(findRoom());
- if (parrotMsg._value) {
+ if (parrotMsg._isPresent) {
CNutPuzzleMsg nutMsg("Jiggle");
nutMsg.execute("NutsParrotPlayer");
}
diff --git a/engines/titanic/game/empty_nut_bowl.cpp b/engines/titanic/game/empty_nut_bowl.cpp
index adee2589f6..f79493af53 100644
--- a/engines/titanic/game/empty_nut_bowl.cpp
+++ b/engines/titanic/game/empty_nut_bowl.cpp
@@ -61,7 +61,7 @@ bool CEmptyNutBowl::ReplaceBowlAndNutsMsg(CReplaceBowlAndNutsMsg *msg) {
}
bool CEmptyNutBowl::NutPuzzleMsg(CNutPuzzleMsg *msg) {
- if (msg->_value == "NutsGone")
+ if (msg->_action == "NutsGone")
setVisible(true);
return true;
}
diff --git a/engines/titanic/game/no_nut_bowl.cpp b/engines/titanic/game/no_nut_bowl.cpp
index 8c0a95ac9a..251717f0ed 100644
--- a/engines/titanic/game/no_nut_bowl.cpp
+++ b/engines/titanic/game/no_nut_bowl.cpp
@@ -50,7 +50,7 @@ bool CNoNutBowl::ReplaceBowlAndNutsMsg(CReplaceBowlAndNutsMsg *msg) {
}
bool CNoNutBowl::NutPuzzleMsg(CNutPuzzleMsg *msg) {
- if (msg->_value == "NutsGone")
+ if (msg->_action == "NutsGone")
setVisible(true);
return true;
}
diff --git a/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp b/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
index 69fc629606..56c096eec1 100644
--- a/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
+++ b/engines/titanic/game/parrot/parrot_nut_bowl_actor.cpp
@@ -104,9 +104,9 @@ bool CParrotNutBowlActor::LeaveViewMsg(CLeaveViewMsg *msg) {
}
bool CParrotNutBowlActor::NutPuzzleMsg(CNutPuzzleMsg *msg) {
- if (msg->_value == "NutsGone")
+ if (msg->_action == "NutsGone")
_state = 1;
- else if (msg->_value == "BowlUnlocked")
+ else if (msg->_action == "BowlUnlocked")
_state = 2;
return true;
diff --git a/engines/titanic/game/parrot/parrot_nut_eater.cpp b/engines/titanic/game/parrot/parrot_nut_eater.cpp
index 7196d76ccb..3068d54388 100644
--- a/engines/titanic/game/parrot/parrot_nut_eater.cpp
+++ b/engines/titanic/game/parrot/parrot_nut_eater.cpp
@@ -65,7 +65,7 @@ bool CParrotNutEater::ReplaceBowlAndNutsMsg(CReplaceBowlAndNutsMsg *msg) {
}
bool CParrotNutEater::NutPuzzleMsg(CNutPuzzleMsg *msg) {
- if (msg->_value == "Jiggle") {
+ if (msg->_action == "Jiggle") {
setVisible(true);
playMovie(MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
movieEvent(68);