diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-08-07 12:34:41 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-08-07 12:34:41 +0300 |
| commit | 7d8ffa9ebd32257d6aa59e27cd25a657a85613da (patch) | |
| tree | 0eff46681a3524fd86a63bc8a0eb65b3c7409b5b /src/core/World.cpp | |
| parent | 40185161b83091e79455acf6fe82f070e26c6662 (diff) | |
| parent | f14b1fba09fa992a67abe10ca12897fd9db386be (diff) | |
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# src/control/RoadBlocks.cpp
# src/core/Collision.h
# src/core/Pad.cpp
# src/core/SurfaceTable.h
# src/core/main.cpp
# src/core/re3.cpp
# src/peds/Population.cpp
# src/render/Fluff.cpp
# src/render/Shadows.cpp
# src/render/Shadows.h
# src/render/Sprite2d.cpp
# src/weapons/BulletInfo.cpp
Diffstat (limited to 'src/core/World.cpp')
| -rw-r--r-- | src/core/World.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/World.cpp b/src/core/World.cpp index 7126b26f..fb2dbad3 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -1933,6 +1933,11 @@ 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 && RpAnimBlendClumpGetFirstAssociation(movingEnt->GetClump())) { // TODO(MIAMI): doRender argument |