aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/star_control/marked_auto_mover.cpp
diff options
context:
space:
mode:
authorDavid Fioramonti2017-09-07 05:08:38 -0700
committerDavid Fioramonti2017-09-07 06:25:43 -0700
commitd69404d5de6fded94803c36bd0d5fe012d705c0a (patch)
treee5b574dfeb9fa62fbf71f1ef1e24bba79a5a4324 /engines/titanic/star_control/marked_auto_mover.cpp
parent40684e83d33eea7bfc91efb1e89d77d7e6ce8f14 (diff)
downloadscummvm-rg350-d69404d5de6fded94803c36bd0d5fe012d705c0a.tar.gz
scummvm-rg350-d69404d5de6fded94803c36bd0d5fe012d705c0a.tar.bz2
scummvm-rg350-d69404d5de6fded94803c36bd0d5fe012d705c0a.zip
TITANIC: Make use of CCameraAutoMover::setPath() more clear
There was a setPath() adn setPath2() function took in different arguments and were doing the same thing, but not using the different arguments. I made it into one function that only takes in the arguments it uses. Also it was marked virtual, but all the derived classes, CMarkedAutoMover, and CUnmarkedAutoMover were just doing there own thing and then calling this base class implementation. Therefore, I made it be not virtual and the derived classes can do there own thing and then call this, but since they are doing slightly different things it makes sense to differentiate the names and not have them all be called setPath. I.e., the derived classes also change the orientation so that is included in their function names to reflect that.
Diffstat (limited to 'engines/titanic/star_control/marked_auto_mover.cpp')
-rw-r--r--engines/titanic/star_control/marked_auto_mover.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/star_control/marked_auto_mover.cpp b/engines/titanic/star_control/marked_auto_mover.cpp
index 0787c48de3..ae987aa8fc 100644
--- a/engines/titanic/star_control/marked_auto_mover.cpp
+++ b/engines/titanic/star_control/marked_auto_mover.cpp
@@ -26,9 +26,9 @@
namespace Titanic {
-void CMarkedAutoMover::setPath2(const FVector &oldPos, const FVector &newPos,
+void CMarkedAutoMover::setPathOrients(const FVector &oldPos, const FVector &newPos,
const FMatrix &oldOrientation, const FMatrix &newOrientation) {
- CCameraAutoMover::setPath2(oldPos, newPos, oldOrientation, newOrientation);
+ CCameraAutoMover::setPath(oldPos, newPos);
double distance = _distance;
_active = true;