diff options
| author | Paul Gilbert | 2017-05-31 19:00:17 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-05-31 19:00:17 -0400 |
| commit | 520ba69b24148b80c1a91caef32da96b57b3e931 (patch) | |
| tree | 7253b6dc1ce6e7997a7883f77855789efdb2b9b8 /engines/titanic/star_control | |
| parent | 29b7ada2be48f154bede03bf5e7f15ed868dfce2 (diff) | |
| download | scummvm-rg350-520ba69b24148b80c1a91caef32da96b57b3e931.tar.gz scummvm-rg350-520ba69b24148b80c1a91caef32da96b57b3e931.tar.bz2 scummvm-rg350-520ba69b24148b80c1a91caef32da96b57b3e931.zip | |
TITANIC: Renamings for locking/unlocking markers
Diffstat (limited to 'engines/titanic/star_control')
| -rw-r--r-- | engines/titanic/star_control/star_control.cpp | 8 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_view.cpp | 7 | ||||
| -rw-r--r-- | engines/titanic/star_control/star_view.h | 11 |
3 files changed, 18 insertions, 8 deletions
diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp index b58a5408c7..d9737bc2f6 100644 --- a/engines/titanic/star_control/star_control.cpp +++ b/engines/titanic/star_control/star_control.cpp @@ -242,12 +242,12 @@ void CStarControl::doAction(StarControlAction action) { _view.fn3(false); break; - case STAR_17: - _view.fn16(); + case LOCK_STAR: + _view.lockStar(); break; - case STAR_18: - _view.fn17(); + case UNLOCK_STAR: + _view.unlockStar(); break; case STAR_19: diff --git a/engines/titanic/star_control/star_view.cpp b/engines/titanic/star_control/star_view.cpp index d93e7aa22b..12945b9b5a 100644 --- a/engines/titanic/star_control/star_view.cpp +++ b/engines/titanic/star_control/star_view.cpp @@ -375,7 +375,7 @@ void CStarView::setHasReference() { _field218 = true; } -void CStarView::fn16() { +void CStarView::lockStar() { if (_starField && !_showingPhoto) { CSurfaceArea surfaceArea(_videoSurface); FVector v1, v2, v3; @@ -387,16 +387,19 @@ void CStarView::fn16() { switch (_starField->getMatchedIndex()) { case -1: + // First star match _camera.fn2(v1, v2, v3); _starField->fn7(); break; case 0: + // Second star match _camera.fn3(&_photoViewport, v2); _starField->fn7(); break; case 1: + // Third star match _camera.fn1(&_photoViewport, v2); _starField->fn7(); break; @@ -408,7 +411,7 @@ void CStarView::fn16() { } } -void CStarView::fn17() { +void CStarView::unlockStar() { if (_starField && !_showingPhoto) { _camera.removeMatrixRow(); _starField->fn8(_photoSurface); diff --git a/engines/titanic/star_control/star_view.h b/engines/titanic/star_control/star_view.h index ce082a45a3..a98886eb51 100644 --- a/engines/titanic/star_control/star_view.h +++ b/engines/titanic/star_control/star_view.h @@ -158,8 +158,15 @@ public: */ void setHasReference(); - void fn16(); - void fn17(); + /** + * Handles locking in a star + */ + void lockStar(); + + /** + * Handles unlocking a star + */ + void unlockStar(); }; |