[Scummvm-git-logs] scummvm master -> fcbeb161b364fcc8d0d1bf8f78bd2ae10c8ded13

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fcbeb161b3 TITANIC: Renamings of fields in CLiftIndicator


Commit: fcbeb161b364fcc8d0d1bf8f78bd2ae10c8ded13
    https://github.com/scummvm/scummvm/commit/fcbeb161b364fcc8d0d1bf8f78bd2ae10c8ded13
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-11T17:55:50-05:00

Commit Message:
TITANIC: Renamings of fields in CLiftIndicator

Changed paths:
    engines/titanic/game/transport/lift_indicator.cpp
    engines/titanic/game/transport/lift_indicator.h
    engines/titanic/support/strings.h



diff --git a/engines/titanic/game/transport/lift_indicator.cpp b/engines/titanic/game/transport/lift_indicator.cpp
index a642451..6e4ab17 100644
--- a/engines/titanic/game/transport/lift_indicator.cpp
+++ b/engines/titanic/game/transport/lift_indicator.cpp
@@ -38,15 +38,15 @@ BEGIN_MESSAGE_MAP(CLiftindicator, CLift)
 END_MESSAGE_MAP()
 
 CLiftindicator::CLiftindicator() : CLift(),
-		_fieldFC(0), _start(0), _end(0) {
+		_fieldFC(0), _startY(0), _endY(0) {
 }
 
 void CLiftindicator::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
 	file->writeNumberLine(_fieldFC, indent);
 	file->writePoint(_indicatorPos, indent);
-	file->writeNumberLine(_start, indent);
-	file->writeNumberLine(_end, indent);
+	file->writeNumberLine(_startY, indent);
+	file->writeNumberLine(_endY, indent);
 
 	CLift::save(file, indent);
 }
@@ -55,8 +55,8 @@ void CLiftindicator::load(SimpleFile *file) {
 	file->readNumber();
 	_fieldFC = file->readNumber();
 	_indicatorPos = file->readPoint();
-	_start = file->readNumber();
-	_end = file->readNumber();
+	_startY = file->readNumber();
+	_endY = file->readNumber();
 
 	CLift::load(file);
 }
@@ -155,8 +155,8 @@ bool CLiftindicator::PETActivateMsg(CPETActivateMsg *msg) {
 					&& pet->getRoomsFloorNum() != CLift::_elevator4Floor) {
 				petDisplayMessage(1, ELEVATOR_NON_FUNCTIONAL);
 			} else {
-				_start = _indicatorPos.y + (int)(_startFrame * multiplier);
-				_end = _indicatorPos.y + (int)(_endFrame * multiplier);
+				_startY = _indicatorPos.y + (int)(_startFrame * multiplier);
+				_endY = _indicatorPos.y + (int)(_endFrame * multiplier);
 				lockMouse();
 				addTimer(100);
 
@@ -213,15 +213,15 @@ bool CLiftindicator::LeaveRoomMsg(CLeaveRoomMsg *msg) {
 }
 
 bool CLiftindicator::TimerMsg(CTimerMsg *msg) {
-	debugC(kDebugScripts, "Start %d, End %d", _start, _end);
+	debugC(kDebugScripts, "Start %d, End %d", _startY, _endY);
 
-	if (_start > _end) {
+	if (_startY > _endY) {
 		setPosition(Point(_bounds.left, _bounds.top - 1));
-		--_start;
+		--_startY;
 		addTimer(20);
-	} else if (_start < _end) {
+	} else if (_startY < _endY) {
 		setPosition(Point(_bounds.left, _bounds.top + 1));
-		++_start;
+		++_startY;
 		addTimer(20);
 	} else {
 		CMovieEndMsg endMsg(0, 0);
diff --git a/engines/titanic/game/transport/lift_indicator.h b/engines/titanic/game/transport/lift_indicator.h
index 5d0bc45..5ed1cae 100644
--- a/engines/titanic/game/transport/lift_indicator.h
+++ b/engines/titanic/game/transport/lift_indicator.h
@@ -41,8 +41,8 @@ class CLiftindicator : public CLift {
 private:
 	int _fieldFC;
 	Point _indicatorPos;
-	int _start;
-	int _end;
+	int _startY;
+	int _endY;
 public:
 	CLASSDEF;
 	CLiftindicator();
diff --git a/engines/titanic/support/strings.h b/engines/titanic/support/strings.h
index 2a18435..30aad89 100644
--- a/engines/titanic/support/strings.h
+++ b/engines/titanic/support/strings.h
@@ -86,6 +86,7 @@ enum StringId {
 	NICE_IF_TAKE_BUT_CANT,
 	BOWL_OF_NUTS,
 	NOT_A_BOWL_OF_NUTS,
+
 	CANT_SUMMON_DOORBOT,
 	CANT_SUMMON_BELLBOT,
 	NO_ONE_TO_TALK_TO,