diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-06-05 12:13:27 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-06-24 20:45:48 +0200 |
| commit | 776e8ff2eeb96a068383f5802e0d86f56b69c1f0 (patch) | |
| tree | 4ce647151b3b9205cb7480416f175826a1aa97c4 | |
| parent | Fix sin & cos calls (diff) | |
| download | re3-776e8ff2eeb96a068383f5802e0d86f56b69c1f0.tar re3-776e8ff2eeb96a068383f5802e0d86f56b69c1f0.tar.gz re3-776e8ff2eeb96a068383f5802e0d86f56b69c1f0.tar.bz2 re3-776e8ff2eeb96a068383f5802e0d86f56b69c1f0.tar.lz re3-776e8ff2eeb96a068383f5802e0d86f56b69c1f0.tar.xz re3-776e8ff2eeb96a068383f5802e0d86f56b69c1f0.tar.zst re3-776e8ff2eeb96a068383f5802e0d86f56b69c1f0.zip | |
| -rw-r--r-- | src/core/Cam.cpp | 2 | ||||
| -rw-r--r-- | src/core/main.cpp | 2 | ||||
| -rw-r--r-- | src/peds/Ped.cpp | 2 | ||||
| -rw-r--r-- | src/peds/PlayerPed.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp index c741081f..56409af4 100644 --- a/src/core/Cam.cpp +++ b/src/core/Cam.cpp @@ -5399,7 +5399,7 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation, float alphaToFace = Atan2(hi.z, hi.Magnitude2D()) + DEGTORAD(15.0f); float neededAlphaTurn = alphaToFace - carGunUD; - float alphaTurnPerFrame = CTimer::GetTimeStep() * 0.02f; + float alphaTurnPerFrame = CTimer::GetTimeStepInSeconds(); if (neededAlphaTurn > alphaTurnPerFrame) { neededTurn = alphaTurnPerFrame; diff --git a/src/core/main.cpp b/src/core/main.cpp index e8188cec..8267a1b2 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1149,7 +1149,7 @@ DisplayGameDebugText() FramesPerSecondCounter += frameTime / 1000.f; // convert to seconds FramesPerSecond = FrameSamples / FramesPerSecondCounter; #else - FramesPerSecondCounter += 1000.0f / (CTimer::GetTimeStepNonClippedInSeconds() * 1000.0f); + FramesPerSecondCounter += 1000.0f / CTimer::GetTimeStepNonClippedInMilliseconds(); FramesPerSecond = FramesPerSecondCounter / FrameSamples; #endif diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 83c3bbaf..160b903c 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -2382,7 +2382,7 @@ CPed::ProcessControl(void) if (m_nPedState == PED_JUMP) { if (m_nWaitTimer <= 2000) { if (m_nWaitTimer < 1000) - m_nWaitTimer += CTimer::GetTimeStep() * 0.02f * 1000.0f; + m_nWaitTimer += CTimer::GetTimeStepInMilliseconds(); } else { m_nWaitTimer = 0; } diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index b161caed..5c40419e 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -869,7 +869,7 @@ CPlayerPed::PlayerControl1stPersonRunAround(CPad *padUsed) if (m_nPedState == PED_JUMP) { if (bIsInTheAir) { if (bUsesCollision && !bHitSteepSlope && (!bHitSomethingLastFrame || m_vecDamageNormal.z > 0.6f) - && m_fDistanceTravelled < CTimer::GetTimeStep() * 0.02 && m_vecMoveSpeed.MagnitudeSqr() < 0.01f) { + && m_fDistanceTravelled < CTimer::GetTimeStepInSeconds() && m_vecMoveSpeed.MagnitudeSqr() < 0.01f) { float angleSin = Sin(m_fRotationCur); // originally sin(DEGTORAD(RADTODEG(m_fRotationCur))) o_O float angleCos = Cos(m_fRotationCur); @@ -1484,7 +1484,7 @@ CPlayerPed::PlayerControlZelda(CPad *padUsed) if (m_nPedState == PED_JUMP) { if (bIsInTheAir) { if (bUsesCollision && !bHitSteepSlope && (!bHitSomethingLastFrame || m_vecDamageNormal.z > 0.6f) - && m_fDistanceTravelled < CTimer::GetTimeStep() * 0.02 && m_vecMoveSpeed.MagnitudeSqr() < 0.01f) { + && m_fDistanceTravelled < CTimer::GetTimeStepInSeconds() && m_vecMoveSpeed.MagnitudeSqr() < 0.01f) { float angleSin = Sin(m_fRotationCur); // originally sin(DEGTORAD(RADTODEG(m_fRotationCur))) o_O float angleCos = Cos(m_fRotationCur); |