TITANIC: Renamings for nut bowl messages

10 files changed, 12 insertions, 12 deletions

diff --git a/engines/titanic/carry/bowl_ear.cpp b/engines/titanic/carry/bowl_ear.cpp
index ac28439de4..61cbee3dac 100644
--- a/engines/titanic/carry/bowl_ear.cpp
+++ b/engines/titanic/carry/bowl_ear.cpp
@@ -54,7 +54,7 @@ bool CBowlEar::ReplaceBowlAndNutsMsg(CReplaceBowlAndNutsMsg *msg) {
 }
 
 bool CBowlEar::NutPuzzleMsg(CNutPuzzleMsg *msg) {
-	if (msg->_value == "BowlUnlocked")
+	if (msg->_action == "BowlUnlocked")
 		_canTake = true;
 
 	return true;
diff --git a/engines/titanic/carry/carry_parrot.cpp b/engines/titanic/carry/carry_parrot.cpp
index 4bb3a96bfb..429c62e8df 100644
--- a/engines/titanic/carry/carry_parrot.cpp
+++ b/engines/titanic/carry/carry_parrot.cpp
@@ -86,7 +86,7 @@ bool CCarryParrot::TimerMsg(CTimerMsg *msg) {
 }
 
 bool CCarryParrot::IsParrotPresentMsg(CIsParrotPresentMsg *msg) {
-	msg->_value = true;
+	msg->_isPresent = true;
 	return true;
 }
 
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);
diff --git a/engines/titanic/main_game_window.cpp b/engines/titanic/main_game_window.cpp
index 9fdeac327f..f3753b15c1 100644
--- a/engines/titanic/main_game_window.cpp
+++ b/engines/titanic/main_game_window.cpp
@@ -195,7 +195,7 @@ void CMainGameWindow::drawView() {
 }
 
 void CMainGameWindow::drawViewContents(CScreenManager *screenManager) {
-	// Get a reference to the reference, validating that it's present
+	// Get a reference to the room, validating that it's present
 	if (!screenManager)
 		return;
 	CViewItem *view = _gameManager->getView();
diff --git a/engines/titanic/messages/messages.h b/engines/titanic/messages/messages.h
index a1e9ccbf9d..0b1da593e8 100644
--- a/engines/titanic/messages/messages.h
+++ b/engines/titanic/messages/messages.h
@@ -274,7 +274,7 @@ MESSAGE2(CHoseConnectedMsg, bool, connected, true, CGameObject *, object, nullpt
 MESSAGE0(CInitializeAnimMsg);
 MESSAGE1(CIsEarBowlPuzzleDone, int, value, 0);
 MESSAGE3(CIsHookedOnMsg, Rect, rect, Rect(), bool, isHooked, false, CString, armName, "");
-MESSAGE1(CIsParrotPresentMsg, bool, value, false);
+MESSAGE1(CIsParrotPresentMsg, bool, isPresent, false);
 MESSAGE1(CKeyCharMsg, int, key, 32);
 MESSAGE2(CLeaveNodeMsg, CNodeItem *, oldNode, nullptr, CNodeItem *, newNode, nullptr);
 MESSAGE2(CLeaveRoomMsg, CRoomItem *, oldRoom, nullptr, CRoomItem *, newRoom, nullptr);
@@ -296,7 +296,7 @@ MESSAGE2(CNPCPlayAnimationMsg, const char *const *, names, nullptr, int, maxDura
 MESSAGE1(CNPCPlayIdleAnimationMsg, const char *const *, names, 0);
 MESSAGE3(CNPCPlayTalkingAnimationMsg, uint, speechDuration, 0, int, value2, 0, const char *const *, names, nullptr);
 MESSAGE0(CNPCQueueIdleAnimMsg);
-MESSAGE1(CNutPuzzleMsg, CString, value, "");
+MESSAGE1(CNutPuzzleMsg, CString, action, "");
 MESSAGE1(COnSummonBotMsg, int, value, 0);
 MESSAGE0(COpeningCreditsMsg);
 MESSAGE1(CPanningAwayFromParrotMsg, CMovePlayerTo *, target, nullptr);