X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2FEntities%2FBall.cpp;h=e235739eb6e42269af7232dc51ff375a4657da8a;hb=HEAD;hp=d0563d7094ca5a4b5eed9a24182ad3f7deb3d1f1;hpb=41379c9cf8b7128f23a9c285d3e50cad0d5d2de4;p=physics.git

diff --git a/src/Entities/Ball.cpp b/src/Entities/Ball.cpp
index d0563d7..e235739 100644
--- a/src/Entities/Ball.cpp
+++ b/src/Entities/Ball.cpp
@@ -17,8 +17,9 @@
 
 #include "Ball.h"
 
-#include <pg/debug.h>
-#include <pg/Vector2.h>
+#include <bear/debug.h>
+#include <bear/Vector2.h>
+using namespace bear;
 
 #include "graphics/graphics.h"
 
@@ -26,7 +27,7 @@
 /// ***** Constructors/Destructors *****
 
 Ball::Ball(const Vector2& pos, float radius, const float* color)
-    : PhysicsEntity(pos), radius(radius), color(color)
+    : PhysicsEntity(pos), m_radius(radius), m_color(color)
 {
 
 }
@@ -39,10 +40,10 @@ Ball::~Ball()
 
 void Ball::draw() const
 {
-    graphics::drawCircle(radius, position, color);
+    graphics::drawCircle(m_radius, m_position, m_color);
 }
 
 float Ball::getRadius() const
 {
-    return radius;
+    return m_radius;
 }