diff options
author | Paul Gilbert | 2017-05-30 22:23:31 -0400 |
---|---|---|
committer | Paul Gilbert | 2017-05-30 22:23:31 -0400 |
commit | b21e829a9fab7818159539b83cd20f81a6b16465 (patch) | |
tree | acaef1897ef8e355679f40ee71b72c3a94d760ca /engines/titanic/star_control | |
parent | f698d04008c5342f98d58607d6c3259d42965a5f (diff) | |
download | scummvm-rg350-b21e829a9fab7818159539b83cd20f81a6b16465.tar.gz scummvm-rg350-b21e829a9fab7818159539b83cd20f81a6b16465.tar.bz2 scummvm-rg350-b21e829a9fab7818159539b83cd20f81a6b16465.zip |
TITANIC: Renamings and fixes for starfield marker buttons in PET
Diffstat (limited to 'engines/titanic/star_control')
-rw-r--r-- | engines/titanic/star_control/star_control.cpp | 12 | ||||
-rw-r--r-- | engines/titanic/star_control/star_field.cpp | 10 | ||||
-rw-r--r-- | engines/titanic/star_control/star_field.h | 7 |
3 files changed, 16 insertions, 13 deletions
diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp index 06ab3d363a..b58a5408c7 100644 --- a/engines/titanic/star_control/star_control.cpp +++ b/engines/titanic/star_control/star_control.cpp @@ -136,16 +136,16 @@ void CStarControl::newFrame() { _petControl = getPetControl(); if (_petControl) { - int val1 = _starField.getMatchedIndex(); - int val2 = 0; + int matchIndex = _starField.getMatchedIndex(); + bool isClose = false; if (_starField.getMode() == MODE_STARFIELD) { - val2 = _starField.get5(); - if ((val1 + 2) == _starField.getMarkerCount()) - val2 = 0; + isClose = _starField.isCloseToMarker(); + if ((matchIndex + 2) != _starField.getMarkerCount()) + isClose = false; } - _petControl->starsSetButtons(val1, val2); + _petControl->starsSetButtons(matchIndex, isClose); } } diff --git a/engines/titanic/star_control/star_field.cpp b/engines/titanic/star_control/star_field.cpp index 486cc50c60..1cfc57631b 100644 --- a/engines/titanic/star_control/star_field.cpp +++ b/engines/titanic/star_control/star_field.cpp @@ -28,7 +28,7 @@ namespace Titanic { CStarField::CStarField() : _points1On(false), _points2On(false), _mode(MODE_STARFIELD), - _showBox(true), _val5(0), _isSolved(false) { + _showBox(true), _closeToMarker(false), _isSolved(false) { } void CStarField::load(SimpleFile *file) { @@ -126,8 +126,8 @@ int CStarField::getMatchedIndex() const { return _crosshairs._matchIndex; } -int CStarField::get5() const { - return _val5; +bool CStarField::isCloseToMarker() const { + return _closeToMarker; } void CStarField::setSolved() { @@ -170,7 +170,7 @@ void CStarField::drawBox(CSurfaceArea *surfaceArea) { void CStarField::fn4(CSurfaceArea *surfaceArea, CStarCamera *camera) { FVector v1, v2, v3; - _val5 = 0; + _closeToMarker = false; if (_mode == MODE_STARFIELD) { if (fn5(surfaceArea, camera, v1, v2, v3) > -1.0) { @@ -206,7 +206,7 @@ double CStarField::fn5(CSurfaceArea *surfaceArea, CStarCamera *camera, if ((v1._y - pt._y) * (v1._y - pt._y) + incr > 3600.0) return -1.0; - _val5 = 1; + _closeToMarker = true; return v1._y - pt._y; } diff --git a/engines/titanic/star_control/star_field.h b/engines/titanic/star_control/star_field.h index 1cca40567b..12af83a6a8 100644 --- a/engines/titanic/star_control/star_field.h +++ b/engines/titanic/star_control/star_field.h @@ -43,7 +43,7 @@ private: bool _points2On; StarMode _mode; bool _showBox; - int _val5; + bool _closeToMarker; bool _isSolved; private: /** @@ -104,7 +104,10 @@ public: */ int getMatchedIndex() const; - int get5() const; + /** + * Returns true if the center of the starfield viewpoint is close to a marker + */ + bool isCloseToMarker() const; /** * Sets the flag that the starfield has been solved |