named members m_* to quite -Wshadow

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

diff --git a/src/Entities/Ball.cpp b/src/Entities/Ball.cpp
index 37a37c7..750b2e5 100644 (file)
--- a/src/Entities/Ball.cpp
+++ b/src/Entities/Ball.cpp
@@ -1,12 +1,33 @@
+/*
+ *  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 "Ball.h"
-#include "../debug.h"
 
-#include "../Vector2.h"
-#include "../graphics/graphics.h"
+#include <bear/debug.h>
+#include <bear/Vector2.h>
+using namespace bear;
+
+#include "graphics/graphics.h"
+
+
+/// ***** Constructors/Destructors *****
 
-/// ***** Public Class Methods *****
 Ball::Ball(const Vector2& pos, float radius, const float* color)
-    : PhysicsEntity(pos), radius(radius), color(color)
+    : PhysicsEntity(pos), m_radius(radius), m_color(color)
 {
 
 }
@@ -15,7 +36,14 @@ Ball::~Ball()
 
 }
 
+/// ***** Public Class Methods *****
+
 void Ball::draw() const
 {
-    glDrawCircle(radius, position, color);
+    graphics::drawCircle(m_radius, position, m_color);
+}
+
+float Ball::getRadius() const
+{
+    return m_radius;
 }