diff options
author | aap <aap@papnet.eu> | 2020-12-16 21:54:01 +0100 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-12-16 21:54:01 +0100 |
commit | 1af5065df708c47376a06e426ae2c10206a0373b (patch) | |
tree | 1da172a230f711262dd2eb0517e3570a8cbce43f /src/core/World.cpp | |
parent | finished CMBlur (diff) | |
parent | Fixes and style changes (diff) | |
download | re3-1af5065df708c47376a06e426ae2c10206a0373b.tar re3-1af5065df708c47376a06e426ae2c10206a0373b.tar.gz re3-1af5065df708c47376a06e426ae2c10206a0373b.tar.bz2 re3-1af5065df708c47376a06e426ae2c10206a0373b.tar.lz re3-1af5065df708c47376a06e426ae2c10206a0373b.tar.xz re3-1af5065df708c47376a06e426ae2c10206a0373b.tar.zst re3-1af5065df708c47376a06e426ae2c10206a0373b.zip |
Diffstat (limited to 'src/core/World.cpp')
-rw-r--r-- | src/core/World.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp index 84722fc5..a75d17eb 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -2025,7 +2025,8 @@ CWorld::Process(void) if (csObj->IsObject()) RpAnimBlendClumpUpdateAnimations(csObj->GetClump(), 0.02f * CTimer::GetTimeStepNonClipped()); else { - csObj->bOffscreen = !csObj->GetIsOnScreen(); + if (!csObj->bOffscreen) + csObj->bOffscreen = !csObj->GetIsOnScreen(); RpAnimBlendClumpUpdateAnimations(csObj->GetClump(), 0.02f * CTimer::GetTimeStep(), !csObj->bOffscreen); } } @@ -2040,17 +2041,13 @@ CWorld::Process(void) } else { for(CPtrNode *node = ms_listMovingEntityPtrs.first; node; node = node->next) { CEntity *movingEnt = (CEntity *)node->item; -#ifdef SQUEEZE_PERFORMANCE - if (movingEnt->bRemoveFromWorld) { - RemoveEntityInsteadOfProcessingIt(movingEnt); - } else -#endif - if(movingEnt->m_rwObject && RwObjectGetType(movingEnt->m_rwObject) == rpCLUMP && + if(!movingEnt->bRemoveFromWorld && movingEnt->m_rwObject && RwObjectGetType(movingEnt->m_rwObject) == rpCLUMP && RpAnimBlendClumpGetFirstAssociation(movingEnt->GetClump())) { if (movingEnt->IsObject()) RpAnimBlendClumpUpdateAnimations(movingEnt->GetClump(), 0.02f * CTimer::GetTimeStepNonClipped()); else { - movingEnt->bOffscreen = !movingEnt->GetIsOnScreen(); + if (!movingEnt->bOffscreen) + movingEnt->bOffscreen = !movingEnt->GetIsOnScreen(); RpAnimBlendClumpUpdateAnimations(movingEnt->GetClump(), 0.02f * CTimer::GetTimeStep(), !movingEnt->bOffscreen); } } |