From 4bdea384c30586a861ccbc102039258faafe3d90 Mon Sep 17 00:00:00 2001
From: David Fioramonti
Date: Thu, 7 Sep 2017 05:16:26 -0700
Subject: TITANIC: make sure of setOrientations more clear

Made camera automover setOrientations not virtual and reduced
arguments also changed name since to differentiate it from
behavior of derived classes.
---
 engines/titanic/star_control/camera_auto_mover.cpp   | 3 +--
 engines/titanic/star_control/camera_auto_mover.h     | 2 +-
 engines/titanic/star_control/unmarked_auto_mover.cpp | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/engines/titanic/star_control/camera_auto_mover.cpp b/engines/titanic/star_control/camera_auto_mover.cpp
index 1b016bc549..71f7de85b2 100644
--- a/engines/titanic/star_control/camera_auto_mover.cpp
+++ b/engines/titanic/star_control/camera_auto_mover.cpp
@@ -41,8 +41,7 @@ CCameraAutoMover::CCameraAutoMover() : _srcPos(0.0, 1000000.0, 0.0) {
 	_transitionPercentInc = 0.0;
 }
 
-// TODO: same as proc2 also orientations are not used
-void CCameraAutoMover::setOrientations(const FMatrix &srcOrient, const FMatrix &destOrient) {
+void CCameraAutoMover::clear() {
 	_srcPos.clear();
 	_destPos.clear();
 	_transitionPercent = 1.0;
diff --git a/engines/titanic/star_control/camera_auto_mover.h b/engines/titanic/star_control/camera_auto_mover.h
index d83f15013c..9b7eb1b7ce 100644
--- a/engines/titanic/star_control/camera_auto_mover.h
+++ b/engines/titanic/star_control/camera_auto_mover.h
@@ -62,7 +62,7 @@ public:
 	/**
 	 * Clear src and dest orientation and set some default values for other fields
 	 */	
-	virtual void setOrientations(const FMatrix &srcOrient, const FMatrix &destOrient);
+	void clear();
 
 	/**
 	 * Setup a transition to from one position to another
diff --git a/engines/titanic/star_control/unmarked_auto_mover.cpp b/engines/titanic/star_control/unmarked_auto_mover.cpp
index 1120690b0e..b8cd042e9c 100644
--- a/engines/titanic/star_control/unmarked_auto_mover.cpp
+++ b/engines/titanic/star_control/unmarked_auto_mover.cpp
@@ -28,7 +28,7 @@
 namespace Titanic {
 
 void CUnmarkedAutoMover::setOrientations(const FMatrix &srcOrient, const FMatrix &destOrient) {
-	CCameraAutoMover::setOrientations(srcOrient, destOrient);
+	CCameraAutoMover::clear();
 	_orientationChanger.load(srcOrient, destOrient);
 	_transitionPercentInc = 0.1;
 	_transitionPercent = 0.0;
-- 
cgit v1.2.3