diff options
| author | Paul Gilbert | 2017-04-16 22:03:33 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-04-16 22:03:33 -0400 |
| commit | b22b572e64083c155ee644c8e74f06c854a7017d (patch) | |
| tree | c568dc6c2dbe4bf456571965fd4f3409502e3142 /engines/titanic/star_control/star_control_sub27.cpp | |
| parent | feb359e4a97833b709ecba2b3940fd860754ec4a (diff) | |
| download | scummvm-rg350-b22b572e64083c155ee644c8e74f06c854a7017d.tar.gz scummvm-rg350-b22b572e64083c155ee644c8e74f06c854a7017d.tar.bz2 scummvm-rg350-b22b572e64083c155ee644c8e74f06c854a7017d.zip | |
TITANIC: Further positioning renames
Diffstat (limited to 'engines/titanic/star_control/star_control_sub27.cpp')
| -rw-r--r-- | engines/titanic/star_control/star_control_sub27.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/star_control/star_control_sub27.cpp b/engines/titanic/star_control/star_control_sub27.cpp index d48333f125..3c56b7d93e 100644 --- a/engines/titanic/star_control/star_control_sub27.cpp +++ b/engines/titanic/star_control/star_control_sub27.cpp @@ -29,11 +29,11 @@ void CStarControlSub27::proc2(FVector &oldPos, FVector &newPos, FMatrix &oldOrientation, FMatrix &newOrientation) { CStarControlSub23::proc2(oldPos, newPos, oldOrientation, newOrientation); - double factor = _field24; - if (_field24 > 0.0) { + double distance = _distance; + if (distance > 0.0) { _active = true; - _field34 = 1; - proc6(120, 4, _field24); + _field34 = true; + proc6(120, 4, distance); } if (newPos != oldPos) { @@ -44,7 +44,7 @@ void CStarControlSub27::proc2(FVector &oldPos, FVector &newPos, _moveDelayInc = 0.1; _active = true; } else { - _moveDelayInc = 1.0 / factor; + _moveDelayInc = 1.0 / distance; _active = true; } } @@ -89,7 +89,7 @@ int CStarControlSub27::proc5(CErrorCode &errorCode, FVector &pos, FMatrix &orien void CStarControlSub27::getVectorOnPath(FVector &pos) const { double distance = _posDelta.getDistance(pos); - distance /= _field24; + distance /= _distance; if (distance <= 0.0) { pos = _srcPos; |