From 12ebe10d0178ecbdec1cc58e165926cb58cb13ff Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 18 Jan 2017 20:54:05 -0500
Subject: TITANIC: Renaming of CParrot statics, miscellaneous fixes

---
 engines/titanic/carry/carry_parrot.cpp | 2 +-
 engines/titanic/carry/central_core.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/titanic/carry')

diff --git a/engines/titanic/carry/carry_parrot.cpp b/engines/titanic/carry/carry_parrot.cpp
index c97adc080c..3a2f2c9368 100644
--- a/engines/titanic/carry/carry_parrot.cpp
+++ b/engines/titanic/carry/carry_parrot.cpp
@@ -107,7 +107,7 @@ bool CCarryParrot::MouseDragEndMsg(CMouseDragEndMsg *msg) {
 		petAddToInventory();
 	} else if (compareViewNameTo("ParrotLobby.Node 1.N")) {
 		if (msg->_mousePos.x >= 75 && msg->_mousePos.x <= 565 &&
-				!CParrot::_v2 && !CCage::_open) {
+				!CParrot::_takeOff && !CCage::_open) {
 			setVisible(false);
 			_canTake = false;
 			CTreeItem *perchedParrot = findUnder(getRoot(), "PerchedParrot");
diff --git a/engines/titanic/carry/central_core.cpp b/engines/titanic/carry/central_core.cpp
index afc3b85bf0..457428ccfc 100644
--- a/engines/titanic/carry/central_core.cpp
+++ b/engines/titanic/carry/central_core.cpp
@@ -57,9 +57,9 @@ bool CCentralCore::UseWithOtherMsg(CUseWithOtherMsg *msg) {
 bool CCentralCore::DropZoneLostObjectMsg(CDropZoneLostObjectMsg *msg) {
 	CString name = msg->_object->getName();
 	if (name == "PerchCoreHolder") {
-		CParrot::_v2 = 1;
+		CParrot::_takeOff = true;
 		if (isEquals("CentralCore"))
-			CParrot::_v5 = 0;
+			CParrot::_coreReplaced = false;
 
 		CActMsg actMsg("LosePerch");
 		actMsg.execute("ParrotLobbyController");
@@ -75,7 +75,7 @@ bool CCentralCore::DropZoneGotObjectMsg(CDropZoneGotObjectMsg *msg) {
 	CString name = msg->_object->getName();
 	if (name == "PerchCoreHolder") {
 		if (isEquals("CentralCore")) {
-			CParrot::_v5 = 1;
+			CParrot::_coreReplaced = true;
 			CActMsg actMsg("CoreReplaced");
 			actMsg.execute("ParrotCage");
 		}
-- 
cgit v1.2.3