From aefbd436eb138caac623e16bdef6d34714b55eb3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 1 Dec 2016 21:49:34 -0500
Subject: TITANIC: Field renaming for CSuccubusDeliveryGlyph

---
 engines/titanic/pet_control/pet_remote_glyphs.cpp | 16 ++++++++--------
 engines/titanic/pet_control/pet_remote_glyphs.h   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engines/titanic')

diff --git a/engines/titanic/pet_control/pet_remote_glyphs.cpp b/engines/titanic/pet_control/pet_remote_glyphs.cpp
index 8e27797ba1..0116aa9156 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_remote_glyphs.cpp
@@ -478,32 +478,32 @@ bool CSuccubusDeliveryGlyph::setup(CPetControl *petControl, CPetGlyphs *owner) {
 	setDefaults("3PetSuccubus", petControl);
 
 	if (owner) {
-		_gfxElement1 = getElement(16);
-		_gfxElement2 = getElement(17);
+		_send = getElement(16);
+		_receive = getElement(17);
 	}
 
 	return true;
 }
 
 void CSuccubusDeliveryGlyph::draw2(CScreenManager *screenManager) {
-	_gfxElement1->draw(screenManager);
-	_gfxElement2->draw(screenManager);
+	_send->draw(screenManager);
+	_receive->draw(screenManager);
 }
 
 bool CSuccubusDeliveryGlyph::MouseButtonDownMsg(const Point &pt) {
-	return _gfxElement1->MouseButtonDownMsg(pt)
-		|| _gfxElement2->MouseButtonDownMsg(pt);
+	return _send->MouseButtonDownMsg(pt)
+		|| _receive->MouseButtonDownMsg(pt);
 }
 
 bool CSuccubusDeliveryGlyph::MouseButtonUpMsg(const Point &pt) {
 	CTreeItem *target = getPetControl()->_remoteTarget;
 
-	if (_gfxElement1 && _gfxElement1->MouseButtonUpMsg(pt)) {
+	if (_send && _send->MouseButtonUpMsg(pt)) {
 		if (target) {
 			CPETDeliverMsg msg;
 			msg.execute(target);
 		}
-	} else if (_gfxElement2 && _gfxElement2->MouseButtonUpMsg(pt)) {
+	} else if (_receive && _receive->MouseButtonUpMsg(pt)) {
 		if (target) {
 			CPETReceiveMsg msg;
 			msg.execute(target);
diff --git a/engines/titanic/pet_control/pet_remote_glyphs.h b/engines/titanic/pet_control/pet_remote_glyphs.h
index d0edd6fbfc..691a70f609 100644
--- a/engines/titanic/pet_control/pet_remote_glyphs.h
+++ b/engines/titanic/pet_control/pet_remote_glyphs.h
@@ -595,10 +595,10 @@ public:
 
 class CSuccubusDeliveryGlyph : public CPetRemoteGlyph {
 private:
-	CPetGfxElement *_gfxElement1, *_gfxElement2;
+	CPetGfxElement *_send, *_receive;
 public:
 	CSuccubusDeliveryGlyph() : CPetRemoteGlyph(),
-		_gfxElement1(nullptr), _gfxElement2(nullptr) {}
+		_send(nullptr), _receive(nullptr) {}
 
 	/**
 	 * Setup the glyph
-- 
cgit v1.2.3