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

[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:
e6857b48d5 TITANIC: Further renamings for orientation changer use


Commit: e6857b48d5c0b357501dee6f6f480560222f600a
    https://github.com/scummvm/scummvm/commit/e6857b48d5c0b357501dee6f6f480560222f600a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-05-21T23:21:26-04:00

Commit Message:
TITANIC: Further renamings for orientation changer use

Changed paths:
    engines/titanic/star_control/star_control_sub23.cpp
    engines/titanic/star_control/star_control_sub23.h
    engines/titanic/star_control/star_control_sub24.cpp
    engines/titanic/star_control/star_control_sub24.h
    engines/titanic/star_control/star_control_sub27.cpp


diff --git a/engines/titanic/star_control/star_control_sub23.cpp b/engines/titanic/star_control/star_control_sub23.cpp
index 72400e6..6e0b99f 100644
--- a/engines/titanic/star_control/star_control_sub23.cpp
+++ b/engines/titanic/star_control/star_control_sub23.cpp
@@ -57,7 +57,7 @@ void CStarControlSub23::proc2(FVector &oldPos, FVector &newPos,
 	_field4C = 0;
 }
 
-void CStarControlSub23::proc3(const FMatrix &m1, const FMatrix &m2) {
+void CStarControlSub23::proc3(const FMatrix &srcOrient, const FMatrix &destOrient) {
 	_srcPos.clear();
 	_destPos.clear();
 	_transitionPercent = 1.0;
diff --git a/engines/titanic/star_control/star_control_sub23.h b/engines/titanic/star_control/star_control_sub23.h
index 9bcbe86..bd9bdd9 100644
--- a/engines/titanic/star_control/star_control_sub23.h
+++ b/engines/titanic/star_control/star_control_sub23.h
@@ -48,14 +48,14 @@ protected:
 	int _field54;
 	double _transitionPercent;
 	double _transitionPercentInc;
-	COrientationChanger _sub25;
+	COrientationChanger _orientationChanger;
 public:
 	CStarControlSub23();
 	virtual ~CStarControlSub23() {}
 
 	virtual void proc2(FVector &oldPos, FVector &newPos,
 		FMatrix &oldOrientation, FMatrix &newOrientation);
-	virtual void proc3(const FMatrix &m1, const FMatrix &m2);
+	virtual void proc3(const FMatrix &srcOrient, const FMatrix &destOrient);
 	virtual void setPath(const FVector &srcV, const FVector &destV, const FMatrix &orientation);
 	virtual int proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) { return 2; }
 	virtual void proc6(int val1, int val2, float val);
diff --git a/engines/titanic/star_control/star_control_sub24.cpp b/engines/titanic/star_control/star_control_sub24.cpp
index 840d9c6..48ed807 100644
--- a/engines/titanic/star_control/star_control_sub24.cpp
+++ b/engines/titanic/star_control/star_control_sub24.cpp
@@ -25,9 +25,9 @@
 
 namespace Titanic {
 
-void CStarControlSub24::proc3(const FMatrix &m1, const FMatrix &m2) {
-	CStarControlSub23::proc3(m1, m2);
-	_sub25.load(m1, m2);
+void CStarControlSub24::proc3(const FMatrix &srcOrient, const FMatrix &destOrient) {
+	CStarControlSub23::proc3(srcOrient, destOrient);
+	_orientationChanger.load(srcOrient, destOrient);
 	_transitionPercentInc = 0.1;
 	_transitionPercent = 0.0;
 	_field40 = _field44 = _field48 = -1;
@@ -69,9 +69,9 @@ void CStarControlSub24::setPath(const FVector &srcV, const FVector &destV, const
 		tv = FVector::addAndNormalize(tempV2, row3, tempV1);
 		tempV1 = *tv;
 
-		FMatrix m1;
-		m1.fn1(tempV1);
-		_sub25.load(orientation, m1);
+		FMatrix newOrient;
+		newOrient.fn1(tempV1);
+		_orientationChanger.load(orientation, newOrient);
 
 		_transitionPercent = 0.0;
 		_transitionPercentInc = 0.1;
@@ -88,7 +88,7 @@ int CStarControlSub24::proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orien
 
 	if (_transitionPercent < 1.0) {
 		_transitionPercent += _transitionPercentInc;
-		orientation = _sub25.getOrientation(_transitionPercent);
+		orientation = _orientationChanger.getOrientation(_transitionPercent);
 		errorCode.set();
 		return 1;
 	}
diff --git a/engines/titanic/star_control/star_control_sub24.h b/engines/titanic/star_control/star_control_sub24.h
index 565f31e..4b810ed 100644
--- a/engines/titanic/star_control/star_control_sub24.h
+++ b/engines/titanic/star_control/star_control_sub24.h
@@ -31,7 +31,7 @@ class CStarControlSub24 : public CStarControlSub23 {
 public:
 	virtual ~CStarControlSub24() {}
 
-	virtual void proc3(const FMatrix &m1, const FMatrix &m2);
+	virtual void proc3(const FMatrix &srcOrient, const FMatrix &destOrient);
 
 	/**
 	 * Sets the path to animate movement between
diff --git a/engines/titanic/star_control/star_control_sub27.cpp b/engines/titanic/star_control/star_control_sub27.cpp
index 1e7454d..9999ec9 100644
--- a/engines/titanic/star_control/star_control_sub27.cpp
+++ b/engines/titanic/star_control/star_control_sub27.cpp
@@ -37,7 +37,7 @@ void CStarControlSub27::proc2(FVector &oldPos, FVector &newPos,
 	}
 
 	if (newPos != oldPos) {
-		_sub25.load(oldOrientation, newOrientation);
+		_orientationChanger.load(oldOrientation, newOrientation);
 		_transitionPercent = 0.0;
 
 		if (_field4C == 0) {
@@ -55,7 +55,7 @@ int CStarControlSub27::proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orien
 		return 0;
 
 	_transitionPercent += _transitionPercentInc;
-	orientation = _sub25.getOrientation(_transitionPercent);
+	orientation = _orientationChanger.getOrientation(_transitionPercent);
 	errorCode.set();
 
 	if (_field40 >= 0) {