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 5365bcc..9b630a7 100644 (file)
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1,21 +1,30 @@
+/*
+ *  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 "Entity.h"
-#include "../Vector2.h"
 
-#include <iostream>
+#include <bear/Vector2.h>
+using namespace bear;
 
-/// ***** Public Class Methods *****
 
-const Vector2& Entity::positionRaw() const
-{
-    return position;
-}
-const Vector2& Entity::velocityRaw() const
-{
-    return velocity;
-}
+/// ***** Constructors/Destructors *****
 
 Entity::Entity(const Vector2& pos)
-  : position(pos), velocity(0,0)
+  : m_position(pos), m_velocity(0,0)
 {
 
 }
@@ -23,3 +32,15 @@ Entity::~Entity()
 {
 
 }
+
+/// ***** Public Class Methods *****
+
+const Vector2& Entity::positionRaw() const
+{
+    return m_position;
+}
+const Vector2& Entity::velocityRaw() const
+{
+    return m_velocity;
+}
+