From d786b7383f500e9f0f882331a8996f8bc9afe282 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 11 Nov 2016 19:59:50 -0500
Subject: TITANIC: Further clenaup of CLiftIndicator class

---
 engines/titanic/game/transport/lift_indicator.cpp | 12 ++++++------
 engines/titanic/game/transport/lift_indicator.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/titanic/game/transport')

diff --git a/engines/titanic/game/transport/lift_indicator.cpp b/engines/titanic/game/transport/lift_indicator.cpp
index 6e4ab17666..df0ff397da 100644
--- a/engines/titanic/game/transport/lift_indicator.cpp
+++ b/engines/titanic/game/transport/lift_indicator.cpp
@@ -38,12 +38,12 @@ BEGIN_MESSAGE_MAP(CLiftindicator, CLift)
 END_MESSAGE_MAP()
 
 CLiftindicator::CLiftindicator() : CLift(),
-		_fieldFC(0), _startY(0), _endY(0) {
+		_multiplier(0), _startY(0), _endY(0) {
 }
 
 void CLiftindicator::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
-	file->writeNumberLine(_fieldFC, indent);
+	file->writeNumberLine(_multiplier, indent);
 	file->writePoint(_indicatorPos, indent);
 	file->writeNumberLine(_startY, indent);
 	file->writeNumberLine(_endY, indent);
@@ -53,7 +53,7 @@ void CLiftindicator::save(SimpleFile *file, int indent) {
 
 void CLiftindicator::load(SimpleFile *file) {
 	file->readNumber();
-	_fieldFC = file->readNumber();
+	_multiplier = file->readNumber();
 	_indicatorPos = file->readPoint();
 	_startY = file->readNumber();
 	_endY = file->readNumber();
@@ -62,7 +62,7 @@ void CLiftindicator::load(SimpleFile *file) {
 }
 
 bool CLiftindicator::EnterViewMsg(CEnterViewMsg *msg) {
-	double multiplier = _fieldFC * 0.037037037;
+	double multiplier = _multiplier * 0.037037037;
 	CPetControl *pet = getPetControl();
 	int floorNum = pet->getRoomsFloorNum();
 	debugC(kDebugScripts, "Lifts = %d,%d,%d,%d, %d",
@@ -70,7 +70,7 @@ bool CLiftindicator::EnterViewMsg(CEnterViewMsg *msg) {
 		CLift::_elevator3Floor, CLift::_elevator4Floor,
 		floorNum);
 
-	if ((pet->petGetRoomsWellEntry() & 1) == (_fieldFC & 1)) {
+	if ((pet->petGetRoomsWellEntry() & 1) == (_liftNum & 1)) {
 		petSetRemoteTarget();
 		petSetArea(PET_REMOTE);
 
@@ -142,7 +142,7 @@ bool CLiftindicator::LeaveViewMsg(CLeaveViewMsg *msg) {
 }
 
 bool CLiftindicator::PETActivateMsg(CPETActivateMsg *msg) {
-	double multiplier = _fieldFC * 0.037037037;
+	double multiplier = _multiplier * 0.037037037;
 	CPetControl *pet = getPetControl();
 
 	if (msg->_name == "Lift") {
diff --git a/engines/titanic/game/transport/lift_indicator.h b/engines/titanic/game/transport/lift_indicator.h
index 5ed1caef4e..5ff9dc6d36 100644
--- a/engines/titanic/game/transport/lift_indicator.h
+++ b/engines/titanic/game/transport/lift_indicator.h
@@ -39,7 +39,7 @@ class CLiftindicator : public CLift {
 	bool LeaveRoomMsg(CLeaveRoomMsg *msg);
 	bool TimerMsg(CTimerMsg *msg);
 private:
-	int _fieldFC;
+	int _multiplier;
 	Point _indicatorPos;
 	int _startY;
 	int _endY;
-- 
cgit v1.2.3