named members m_* to quite -Wshadow

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

diff --git a/src/Entities/Particle.h b/src/Entities/Particle.h
index 6843366..cad470f 100644 (file)
--- a/src/Entities/Particle.h
+++ b/src/Entities/Particle.h
@@ -1,8 +1,27 @@
+/*
+ *  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/>.
+ */
+
 #ifndef PARTICLE_H
 #define PARTICLE_H
 
+#include <bear/Vector2.h>
+using namespace bear;
+
 #include "Entity.h"
-#include "../Vector2.h"
 
 
 /// NOTE to SELF
@@ -25,10 +44,10 @@ class Particle: public Entity
         virtual void update(float);
 
     protected:
-        float lifeTime;
+        float m_lifeTime;
 
-        bool isDead;
-        bool canDie;
+        bool m_isDead;
+        bool m_canDie;
 };
 
 #endif // PARTICLE_H