diff options
author | David Fioramonti | 2017-09-07 05:08:38 -0700 |
---|---|---|
committer | David Fioramonti | 2017-09-07 06:25:43 -0700 |
commit | d69404d5de6fded94803c36bd0d5fe012d705c0a (patch) | |
tree | e5b574dfeb9fa62fbf71f1ef1e24bba79a5a4324 /engines/titanic/star_control/unmarked_auto_mover.h | |
parent | 40684e83d33eea7bfc91efb1e89d77d7e6ce8f14 (diff) | |
download | scummvm-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/unmarked_auto_mover.h')
-rw-r--r-- | engines/titanic/star_control/unmarked_auto_mover.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/star_control/unmarked_auto_mover.h b/engines/titanic/star_control/unmarked_auto_mover.h index b7fb4e3c66..41c13311e0 100644 --- a/engines/titanic/star_control/unmarked_auto_mover.h +++ b/engines/titanic/star_control/unmarked_auto_mover.h @@ -37,9 +37,9 @@ public: virtual void setOrientations(const FMatrix &srcOrient, const FMatrix &destOrient); /** - * Sets the path to animate movement between + * Sets the path and starting and ending orientations to animate movement between */ - virtual void setPath(const FVector &srcV, const FVector &destV, const FMatrix &orientation); + void setPathOrient(const FVector &srcV, const FVector &destV, const FMatrix &orientation); virtual MoverState move(CErrorCode &errorCode, FVector &pos, FMatrix &orientation); }; |