libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-30 23:43:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: make sure of setOrientations more clear

Browse Source 
Made camera automover setOrientations not virtual and reduced
arguments also changed name since to differentiate it from
behavior of derived classes.
This commit is contained in:
David Fioramonti 2017-09-07 05:16:26 -07:00
parent d69404d5de
commit 4bdea384c3
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/titanic/star_control/camera_auto_mover.cpp
View File

@ -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;

2
engines/titanic/star_control/camera_auto_mover.h
View File

@ -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

2
engines/titanic/star_control/unmarked_auto_mover.cpp
View File

@ -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;