X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FEntities%2FEntity.cpp;h=9b630a7837edbdf20d6851fc2113ea92238f66ef;hb=389bf8fdd7e1b8f4fe21e5a9fdb477d40d03d829;hp=09e27ab498bc01142483e9d4cd95fb45b1ac11e1;hpb=41379c9cf8b7128f23a9c285d3e50cad0d5d2de4;p=physics.git

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 09e27ab..9b630a7 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -17,13 +17,14 @@
 
 #include "Entity.h"
 
-#include <pg/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;
 }