renamed a few more members and changed some switch statements

[physics.git] / src / Entities / Particle.cpp

diff --git a/src/Entities/Particle.cpp b/src/Entities/Particle.cpp
index 9322314..c978d38 100644 (file)
--- a/src/Entities/Particle.cpp
+++ b/src/Entities/Particle.cpp
@@ -1,14 +1,35 @@
+/*
+ *  Copyright (C) 2008 Patrik Gornicz, Gornicz_P (at) hotmail (dot) com.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "Particle.h"
-#include "../Vector2.h"
 
-/// ***** Public Class Methods *****
-Particle::Particle(Vector2 pos, bool canDie)
-    : Entity(pos), canDie(canDie)
+#include <bear/Vector2.h>
+using namespace bear;
+
+
+/// ***** Constructors/Destructors *****
+
+Particle::Particle(const Vector2& pos, bool canDie)
+    : Entity(pos), m_canDie(canDie)
 {
 
 }
-Particle::Particle(Vector2 pos, float lifeTime)
-    : Entity(pos), lifeTime(lifeTime)
+Particle::Particle(const Vector2& pos, float lifeTime)
+    : Entity(pos), m_lifeTime(lifeTime)
 {
 
 }
@@ -17,15 +38,17 @@ Particle::~Particle()
 
 }
 
+/// ***** Public Class Methods *****
+
 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;
+    m_position += m_velocity * time_step;
 }