diff options
author | David Fioramonti | 2017-08-18 18:56:03 -0700 |
---|---|---|
committer | David Fioramonti | 2017-08-18 18:56:12 -0700 |
commit | b200317306370e25fb9cb0b3fbefbb5c7b538773 (patch) | |
tree | 89ebc955bba8165f69507e79edd3fc526c552a79 /engines | |
parent | 1370b49b6a88e8ea533da5d62a7f37828bf2fca1 (diff) | |
download | scummvm-rg350-b200317306370e25fb9cb0b3fbefbb5c7b538773.tar.gz scummvm-rg350-b200317306370e25fb9cb0b3fbefbb5c7b538773.tar.bz2 scummvm-rg350-b200317306370e25fb9cb0b3fbefbb5c7b538773.zip |
TITANIC: Renamed functions that adds/removes stars/markers
Before it was add/remove row so the new name is more informative.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/titanic/star_control/base_stars.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/star_control/star_camera.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/star_control/star_camera.h | 11 | ||||
-rw-r--r-- | engines/titanic/star_control/star_view.cpp | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/engines/titanic/star_control/base_stars.cpp b/engines/titanic/star_control/base_stars.cpp index ba4877051b..c22260ea98 100644 --- a/engines/titanic/star_control/base_stars.cpp +++ b/engines/titanic/star_control/base_stars.cpp @@ -561,7 +561,7 @@ int CBaseStars::baseFn2(CSurfaceArea *surfaceArea, CStarCamera *camera) { /*------------------------------------------------------------------------*/ void CStarVector::apply() { - _owner->adDAffineRow(_vector); + _owner->addLockedStar(_vector); } } // End of namespace Titanic diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp index 37196b28ee..c74a1d946d 100644 --- a/engines/titanic/star_control/star_camera.cpp +++ b/engines/titanic/star_control/star_camera.cpp @@ -362,7 +362,7 @@ void CStarCamera::setViewportAngle(const FPoint &angles) { } } -bool CStarCamera::adDAffineRow(const FVector v) { +bool CStarCamera::addLockedStar(const FVector v) { if (_star_lock_state == THREE_LOCKED) return false; @@ -376,7 +376,7 @@ bool CStarCamera::adDAffineRow(const FVector v) { return true; } -bool CStarCamera::removeMatrixRow() { +bool CStarCamera::removeLockedStar() { if (_star_lock_state == ZERO_LOCKED) return false; diff --git a/engines/titanic/star_control/star_camera.h b/engines/titanic/star_control/star_camera.h index 856ef40c99..9de786071e 100644 --- a/engines/titanic/star_control/star_camera.h +++ b/engines/titanic/star_control/star_camera.h @@ -165,13 +165,18 @@ public: virtual StarLockState getStarLockState() const { return _star_lock_state; } /** - * Adds the row for a locked in marker + * Adds the row for a locked in marker/star * @remarks This can't be a pass-by-reference, since adding * the vector for the star destroys the calling star vector */ - virtual bool adDAffineRow(const FVector v); + virtual bool addLockedStar(const FVector v); - virtual bool removeMatrixRow(); + /** + * Removes the most recent locked in marker/star + * @remarks This can't be a pass-by-reference, since adding + * the vector for the star destroys the calling star vector + */ + virtual bool removeLockedStar(); virtual void proc36(double *v1, double *v2, double *v3, double *v4); /** diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp index 8e3da4420d..578cc00898 100644 --- a/engines/titanic/star_control/star_view.cpp +++ b/engines/titanic/star_control/star_view.cpp @@ -430,7 +430,7 @@ void CStarView::lockStar() { void CStarView::unlockStar() { if (_starField && !_showingPhoto) { - _camera.removeMatrixRow(); + _camera.removeLockedStar(); _starField->fn8(_photoSurface); } } |