TITANIC: star control dvector rename fn2 to RotVectAxisY

3 files changed, 13 insertions, 9 deletions

diff --git a/engines/titanic/star_control/dvector.cpp b/engines/titanic/star_control/dvector.cpp
index 1408740f15..728c94e5f0 100644
--- a/engines/titanic/star_control/dvector.cpp
+++ b/engines/titanic/star_control/dvector.cpp
@@ -60,10 +60,10 @@ DVector DVector::DAffMatrixProdVec(const DAffine &m) {
 	return dest;
 }
 
-void DVector::fn2(double angle) {
+void DVector::RotVectAxisY(double angle_deg) {
 	const double FACTOR = 2 * M_PI / 360.0;
-	double sinVal = sin(angle * FACTOR);
-	double cosVal = cos(angle * FACTOR);
+	double sinVal = sin(angle_deg * FACTOR);
+	double cosVal = cos(angle_deg * FACTOR);
 	double x = cosVal * _x - sinVal * _z;
 	double z = cosVal * _z + sinVal * _x;
 
diff --git a/engines/titanic/star_control/dvector.h b/engines/titanic/star_control/dvector.h
index cd57cbc82e..7daeda71aa 100644
--- a/engines/titanic/star_control/dvector.h
+++ b/engines/titanic/star_control/dvector.h
@@ -55,7 +55,11 @@ public:
 	 */
 	DVector DAffMatrixProdVec(const DAffine &m);
 
-	void fn2(double angle);
+	/**
+	 * Rotate this vector about the Y axis
+	 */
+	void RotVectAxisY(double angle_deg);
+
 	DVector fn3() const;
 	DAffine fn4(const DVector &v);
 	DAffine fn5() const;
diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp
index dcc295ad07..6192fc579d 100644
--- a/engines/titanic/star_control/star_camera.cpp
+++ b/engines/titanic/star_control/star_camera.cpp
@@ -509,7 +509,7 @@ void CStarCamera::lockMarker2(CViewport *viewport, const FVector &v) {
 	int minDegree = 0;
 	for (int degree = 0; degree < 360; ++degree) {
 		tempPos = m4._col1;
-		tempPos.fn2((double)degree);
+		tempPos.RotVectAxisY((double)degree);
 		double distance = tempV2.getDistance(tempPos);
 
 		if (distance < minDistance) {
@@ -518,10 +518,10 @@ void CStarCamera::lockMarker2(CViewport *viewport, const FVector &v) {
 		}
 	}
 
-	m4._col1.fn2((double)minDegree);
-	m4._col2.fn2((double)minDegree);
-	m4._col3.fn2((double)minDegree);
-	m4._col4.fn2((double)minDegree);
+	m4._col1.RotVectAxisY((double)minDegree);
+	m4._col2.RotVectAxisY((double)minDegree);
+	m4._col3.RotVectAxisY((double)minDegree);
+	m4._col4.RotVectAxisY((double)minDegree);
 	m4._col1 = m4._col1.DAffMatrixProdVec(m1);
 	m4._col2 = m4._col2.DAffMatrixProdVec(m1);
 	m4._col3 = m4._col3.DAffMatrixProdVec(m1);