From 7752e90c8208a5ebb192f44d85174c2937fbcef8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 16 Mar 2016 20:25:24 +0300 Subject: Remove extra checks from Particle::update. --- src/particle/particle.cpp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/particle') diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp index 0cc97eb53..c00593470 100644 --- a/src/particle/particle.cpp +++ b/src/particle/particle.cpp @@ -213,9 +213,6 @@ void Particle::updateSelf() restrict2 bool Particle::update() restrict2 { - if (!mMap) - return false; - const Vector oldPos = mPos; updateSelf(); @@ -233,25 +230,10 @@ bool Particle::update() restrict2 } // Update child particles - - const int cameraX = viewport->getCameraX(); - const int cameraY = viewport->getCameraY(); - const float x1 = static_cast(cameraX - 3000); - const float y1 = static_cast(cameraY - 2000); - const float x2 = static_cast(cameraX + 3000); - const float y2 = static_cast(cameraY + 2000); - for (ParticleIterator p = mChildParticles.begin(), fp2 = mChildParticles.end(); p != fp2; ) { Particle *restrict const particle = *p; - const float posX = particle->mPos.x; - const float posY = particle->mPos.y; - if (posX < x1 || posX > x2 || posY < y1 || posY > y2) - { - ++p; - continue; - } // move particle with its parent if desired if (particle->mFollow) particle->moveBy(change); -- cgit v1.2.3-60-g2f50