renamed a few more members and changed some switch statements

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

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 847254a..9b630a7 100644 (file)
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -17,13 +17,14 @@
 
 #include "Entity.h"
 
-#include "Vector2.h"
+#include <bear/Vector2.h>
+using namespace bear;
 
 
 /// ***** Constructors/Destructors *****
 
 Entity::Entity(const Vector2& pos)
-  : position(pos), velocity(0,0)
+  : m_position(pos), m_velocity(0,0)
 {
 
 }
@@ -36,10 +37,10 @@ Entity::~Entity()
 
 const Vector2& Entity::positionRaw() const
 {
-    return position;
+    return m_position;
 }
 const Vector2& Entity::velocityRaw() const
 {
-    return velocity;
+    return m_velocity;
 }