TITANIC: Renamings for SuccUBus & hose, minor fixes

1 files changed, 16 insertions, 16 deletions

diff --git a/engines/titanic/npcs/parrot_succubus.cpp b/engines/titanic/npcs/parrot_succubus.cpp
index 08866f187d..2fa5b2f844 100644
--- a/engines/titanic/npcs/parrot_succubus.cpp
+++ b/engines/titanic/npcs/parrot_succubus.cpp
@@ -34,13 +34,13 @@ BEGIN_MESSAGE_MAP(CParrotSuccUBus, CSuccUBus)
 	ON_MESSAGE(LeaveNodeMsg)
 END_MESSAGE_MAP()
 
-CParrotSuccUBus::CParrotSuccUBus() : CSuccUBus(), _field1DC(0),
+CParrotSuccUBus::CParrotSuccUBus() : CSuccUBus(), _hoseConnected(false),
 	_field1EC(0), _field1F0(376), _field1F4(393) {
 }
 
 void CParrotSuccUBus::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
-	file->writeNumberLine(_field1DC, indent);
+	file->writeNumberLine(_hoseConnected, indent);
 	file->writeQuotedLine(_string3, indent);
 	file->writeNumberLine(_field1EC, indent);
 
@@ -49,7 +49,7 @@ void CParrotSuccUBus::save(SimpleFile *file, int indent) {
 
 void CParrotSuccUBus::load(SimpleFile *file) {
 	file->readNumber();
-	_field1DC = file->readNumber();
+	_hoseConnected = file->readNumber();
 	_string3 = file->readString();
 	_field1EC = file->readNumber();
 
@@ -58,13 +58,13 @@ void CParrotSuccUBus::load(SimpleFile *file) {
 
 bool CParrotSuccUBus::HoseConnectedMsg(CHoseConnectedMsg *msg) {
 	CPetControl *pet = getPetControl();
-	if (msg->_value == _field1DC)
+	if (msg->_connected == _hoseConnected)
 		return true;
 	if (mailExists(pet->getRoomFlags()))
 		return false;
 
-	_field1DC = msg->_value;
-	if (_field1DC) {
+	_hoseConnected = msg->_connected;
+	if (_hoseConnected) {
 		CGameObject *item = msg->_object;
 		_string3 = item->getName();
 		CHoseConnectedMsg hoseMsg(1, this);
@@ -73,7 +73,7 @@ bool CParrotSuccUBus::HoseConnectedMsg(CHoseConnectedMsg *msg) {
 
 		CPumpingMsg pumpingMsg(1, this);
 		pumpingMsg.execute(this);
-		_field1DC = 1;
+		_hoseConnected = true;
 
 		if (_enabled) {
 			_enabled = false;
@@ -82,7 +82,7 @@ bool CParrotSuccUBus::HoseConnectedMsg(CHoseConnectedMsg *msg) {
 			playSound("z#26.wav");
 		}
 
-		playMovie(_field1C4, _field1C8, MOVIE_NOTIFY_OBJECT);
+		playMovie(_hoseStartFrame, _hoseEndFrame, MOVIE_NOTIFY_OBJECT);
 	} else {
 		stopMovie();
 		stopSound(_field1EC);
@@ -106,8 +106,8 @@ bool CParrotSuccUBus::HoseConnectedMsg(CHoseConnectedMsg *msg) {
 }
 
 bool CParrotSuccUBus::EnterViewMsg(CEnterViewMsg *msg) {
-	if (_field1DC) {
-		playMovie(_field1CC, _field1D0, MOVIE_REPEAT);
+	if (_hoseConnected) {
+		playMovie(_pumpingStartFrame, _pumpingEndFrame, MOVIE_REPEAT);
 		return true;
 	} else {
 		return CSuccUBus::EnterViewMsg(msg);
@@ -115,8 +115,8 @@ bool CParrotSuccUBus::EnterViewMsg(CEnterViewMsg *msg) {
 }
 
 bool CParrotSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
-	if (msg->_endFrame == _field1C8) {
-		playMovie(_field1CC, _field1D0, MOVIE_REPEAT);
+	if (msg->_endFrame == _hoseEndFrame) {
+		playMovie(_pumpingStartFrame, _pumpingEndFrame, MOVIE_REPEAT);
 		_field1EC = playSound("z#472.wav");
 		return true;
 	} else {
@@ -125,9 +125,9 @@ bool CParrotSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
 }
 
 bool CParrotSuccUBus::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
-	if (_field1DC) {
+	if (_hoseConnected) {
 		CHoseConnectedMsg hoseMsg;
-		hoseMsg._value = 0;
+		hoseMsg._connected = false;
 		hoseMsg.execute(this);
 		return true;
 	} else {
@@ -136,12 +136,12 @@ bool CParrotSuccUBus::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
 }
 
 bool CParrotSuccUBus::LeaveNodeMsg(CLeaveNodeMsg *msg) {
-	if (_field1DC) {
+	if (_hoseConnected) {
 		getHiddenObject(_string3);
 		if (CHose::_statics->_actionTarget.empty()) {
 			playSound("z#51.wav");
 			CHoseConnectedMsg hoseMsg;
-			hoseMsg._value = 0;
+			hoseMsg._connected = false;
 			hoseMsg.execute(this);
 		}
 	}