diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-04-30 12:48:01 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-02 14:13:09 +0200 |
commit | d23b2c423e5811cf6e9de28cbf8490de32ea4fb5 (patch) | |
tree | 0240b530a05679dc6d629c414f59bf56588a93b2 /src/control/Record.cpp | |
parent | Merge pull request #502 from rollschuh2282/patch-1 (diff) | |
download | re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.gz re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.bz2 re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.lz re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.xz re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.zst re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.zip |
Diffstat (limited to '')
-rw-r--r-- | src/control/Record.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Record.cpp b/src/control/Record.cpp index bba9a45d..d086543f 100644 --- a/src/control/Record.cpp +++ b/src/control/Record.cpp @@ -279,7 +279,7 @@ void CRecordDataForChase::SaveOrRetrieveCarPositions(void) } if (CPad::GetPad(0)->GetLeftShockJustDown() && CPad::GetPad(0)->GetRightShockJustDown()) { if (!CPad::GetPad(0)->GetRightShockJustDown()) { - pChaseCars[CurrentCar]->GetPosition() = NewCoorsForRecordedCars[PositionChanges].pos; + pChaseCars[CurrentCar]->SetPosition(NewCoorsForRecordedCars[PositionChanges].pos); pChaseCars[CurrentCar]->SetMoveSpeed(0.0f, 0.0f, 0.0f); pChaseCars[CurrentCar]->GetMatrix().SetRotateZOnly(DEGTORAD(NewCoorsForRecordedCars[PositionChanges].angle)); ++PositionChanges; @@ -311,12 +311,12 @@ void CRecordDataForChase::SaveOrRetrieveCarPositions(void) pChaseCars[i]->GetRight() += (tmp.GetRight() - pChaseCars[i]->GetRight()) * dp; pChaseCars[i]->GetForward() += (tmp.GetForward() - pChaseCars[i]->GetForward()) * dp; pChaseCars[i]->GetUp() += (tmp.GetUp() - pChaseCars[i]->GetUp()) * dp; - pChaseCars[i]->GetPosition() += (tmp.GetPosition() - pChaseCars[i]->GetPosition()) * dp; + pChaseCars[i]->GetMatrix().GetPosition() += (tmp.GetPosition() - pChaseCars[i]->GetPosition()) * dp; } else{ RestoreInfoForCar(pChaseCars[i], &pBaseMemForCar[i][CHASE_SCENE_FRAMES_IN_RECORDING - 1], true); if (i == 0) - pChaseCars[i]->GetPosition().z += 0.2f; + pChaseCars[i]->GetMatrix().GetPosition().z += 0.2f; } pChaseCars[i]->GetMatrix().UpdateRW(); pChaseCars[i]->UpdateRwFrame(); @@ -407,7 +407,7 @@ void CRecordDataForChase::GiveUsACar(int32 mi, CVector pos, float angle, CAutomo if (!CStreaming::HasModelLoaded(mi)) return; CAutomobile* pCar = new CAutomobile(mi, MISSION_VEHICLE); - pCar->GetPosition() = pos; + pCar->SetPosition(pos); pCar->SetStatus(STATUS_PLAYER_PLAYBACKFROMBUFFER); pCar->GetMatrix().SetRotateZOnly(DEGTORAD(angle)); pCar->pDriver = nil; |