diff options
| author | Paul Gilbert | 2017-04-16 18:16:08 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-04-16 18:16:08 -0400 |
| commit | 3877a0642b5fa5a9471dda2c9eb25a575fdfc3ae (patch) | |
| tree | ffc8736b1630636bc6b3b5e74ff657642b81cdd3 /engines/titanic/star_control/star_control_sub22.cpp | |
| parent | 4fae7c8e78ad85547ed0b573e59a00774889e286 (diff) | |
| download | scummvm-rg350-3877a0642b5fa5a9471dda2c9eb25a575fdfc3ae.tar.gz scummvm-rg350-3877a0642b5fa5a9471dda2c9eb25a575fdfc3ae.tar.bz2 scummvm-rg350-3877a0642b5fa5a9471dda2c9eb25a575fdfc3ae.zip | |
TITANIC: Renamings for mover position updates
Diffstat (limited to 'engines/titanic/star_control/star_control_sub22.cpp')
| -rw-r--r-- | engines/titanic/star_control/star_control_sub22.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/titanic/star_control/star_control_sub22.cpp b/engines/titanic/star_control/star_control_sub22.cpp index 8c3c7fa2ab..3e88a32f25 100644 --- a/engines/titanic/star_control/star_control_sub22.cpp +++ b/engines/titanic/star_control/star_control_sub22.cpp @@ -37,10 +37,10 @@ void CStarControlSub22::proc8(FVector &v1, FVector &v2, FMatrix &m1, FMatrix &m2 incLockCount(); } -void CStarControlSub22::proc11(CErrorCode &errorCode, FVector &v, FMatrix &m) { +void CStarControlSub22::updatePosition(CErrorCode &errorCode, FVector &pos, FMatrix &orientation) { if (_sub27.isActive()) { decLockCount(); - int val = _sub27.proc5(errorCode, v, m); + int val = _sub27.proc5(errorCode, pos, orientation); if (val == 1) incLockCount(); if (val == 2) { @@ -49,9 +49,9 @@ void CStarControlSub22::proc11(CErrorCode &errorCode, FVector &v, FMatrix &m) { _starVector->apply(); } } else if (_size != 0.0) { - v._x += m._row3._x * _size; - v._y += m._row3._y * _size; - v._z += m._row3._z * _size; + pos._x += orientation._row3._x * _size; + pos._y += orientation._row3._y * _size; + pos._z += orientation._row3._z * _size; errorCode.set(); } } |