diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-01 12:53:37 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-01 12:53:37 +0100 |
| commit | 4604b45852eaefb2e9b78d65796b7208532dc298 (patch) | |
| tree | 5e02b10d89ace7dc43fab6b0dabc3114face46b4 /src/core | |
| parent | merge master to miami (diff) | |
| parent | Restore some marker code (diff) | |
| download | re3-4604b45852eaefb2e9b78d65796b7208532dc298.tar re3-4604b45852eaefb2e9b78d65796b7208532dc298.tar.gz re3-4604b45852eaefb2e9b78d65796b7208532dc298.tar.bz2 re3-4604b45852eaefb2e9b78d65796b7208532dc298.tar.lz re3-4604b45852eaefb2e9b78d65796b7208532dc298.tar.xz re3-4604b45852eaefb2e9b78d65796b7208532dc298.tar.zst re3-4604b45852eaefb2e9b78d65796b7208532dc298.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/World.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp index 6413a620..1af0c4a4 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -1937,11 +1937,11 @@ CWorld::Process(void) if(csObj->m_rwObject && RwObjectGetType(csObj->m_rwObject) == rpCLUMP && RpAnimBlendClumpGetFirstAssociation(csObj->GetClump())) { if (csObj->IsObject()) - RpAnimBlendClumpUpdateAnimations(csObj->GetClump(), 0.02f * CTimer::GetTimeStepNonClipped()); + RpAnimBlendClumpUpdateAnimations(csObj->GetClump(), CTimer::GetTimeStepNonClippedInSeconds()); else { if (!csObj->bOffscreen) csObj->bOffscreen = !csObj->GetIsOnScreen(); - RpAnimBlendClumpUpdateAnimations(csObj->GetClump(), 0.02f * CTimer::GetTimeStep(), !csObj->bOffscreen); + RpAnimBlendClumpUpdateAnimations(csObj->GetClump(), CTimer::GetTimeStepInSeconds(), !csObj->bOffscreen); } } csObj->ProcessControl(); @@ -1958,11 +1958,11 @@ CWorld::Process(void) if(!movingEnt->bRemoveFromWorld && movingEnt->m_rwObject && RwObjectGetType(movingEnt->m_rwObject) == rpCLUMP && RpAnimBlendClumpGetFirstAssociation(movingEnt->GetClump())) { if (movingEnt->IsObject()) - RpAnimBlendClumpUpdateAnimations(movingEnt->GetClump(), 0.02f * CTimer::GetTimeStepNonClipped()); + RpAnimBlendClumpUpdateAnimations(movingEnt->GetClump(), CTimer::GetTimeStepNonClippedInSeconds()); else { if (!movingEnt->bOffscreen) movingEnt->bOffscreen = !movingEnt->GetIsOnScreen(); - RpAnimBlendClumpUpdateAnimations(movingEnt->GetClump(), 0.02f * CTimer::GetTimeStep(), !movingEnt->bOffscreen); + RpAnimBlendClumpUpdateAnimations(movingEnt->GetClump(), CTimer::GetTimeStepInSeconds(), !movingEnt->bOffscreen); } } } |