X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?p=physics.git;a=blobdiff_plain;f=src%2FEntities%2FParticle.cpp;fp=src%2FEntities%2FParticle.cpp;h=d84ce754988d4fdee55c52ef7489de969a6189dd;hp=c7626d4fe1af8745aa5503209ac92b68bbc6f0ea;hb=fd1a93a71bc0222dd77f56c145d550cb6f7829bc;hpb=a1a3765dc4eaa4f8dad5d8710c3e6f420d3d2e09 diff --git a/src/Entities/Particle.cpp b/src/Entities/Particle.cpp index c7626d4..d84ce75 100644 --- a/src/Entities/Particle.cpp +++ b/src/Entities/Particle.cpp @@ -24,12 +24,12 @@ using namespace bear; /// ***** Constructors/Destructors ***** Particle::Particle(const Vector2& pos, bool canDie) - : Entity(pos), canDie(canDie) + : Entity(pos), m_canDie(canDie) { } Particle::Particle(const Vector2& pos, float lifeTime) - : Entity(pos), lifeTime(lifeTime) + : Entity(pos), m_lifeTime(lifeTime) { } @@ -42,13 +42,13 @@ Particle::~Particle() void Particle::update(float time_step) { - if(isDead) + if(m_isDead) return; - if (canDie) + if (m_canDie) { - lifeTime -= time_step; - isDead = lifeTime <= 0; + m_lifeTime -= time_step; + m_isDead = m_lifeTime <= 0; } position += velocity * time_step; }