From ce4c57bab3d71df5bdde198b3a831f2d6be05786 Mon Sep 17 00:00:00 2001
From: Erik Persson <erikpersson583@gmail.com>
Date: Mon, 20 Jan 2014 08:40:41 +0100
Subject: [PATCH] GL - player inherits dynamicobject instead of object

---
 Code/Game/GameLogic/Level.cpp  | 14 +++++++-------
 Code/Game/GameLogic/Player.cpp |  2 +-
 Code/Game/GameLogic/Player.h   |  5 ++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Code/Game/GameLogic/Level.cpp b/Code/Game/GameLogic/Level.cpp
index 4ce96dee..50862c9e 100644
--- a/Code/Game/GameLogic/Level.cpp
+++ b/Code/Game/GameLogic/Level.cpp
@@ -21,13 +21,13 @@ struct Level::PrivateData
 	{
 	}
 
-	SmartPointer<TeamManager> teamManager;
+	//SmartPointer<TeamManager> teamManager;
 
-	DynamicArray<SmartPointer<StaticObject>> staticObjects;
+	//DynamicArray<SmartPointer<StaticObject>> staticObjects;
 		
-	DynamicArray<SmartPointer<DynamicObject>> dynamicObjects;
+	//DynamicArray<SmartPointer<DynamicObject>> dynamicObjects;
 
-	SmartPointer<GameMode> gameMode;
+	//SmartPointer<GameMode> gameMode;
 
 	SmartPointer<ICustomBody> rigidBodyLevel;
 
@@ -72,17 +72,17 @@ void Level::InitiateLevel(float radius)
 
 void Level::AddPlayerToTeam(Player *player, int teamID)
 {
-	myData->teamManager->AddPlayerToTeam(player,teamID);
+	//myData->teamManager->AddPlayerToTeam(player,teamID);
 }
 
 void Level::CreateTeam(int teamSize)
 {
-	myData->teamManager->CreateTeam(teamSize);
+	//myData->teamManager->CreateTeam(teamSize);
 }
 
 void Level::RespawnPlayer(Player *player)
 {
-	myData->teamManager->RespawnPlayerRandom(player);
+	//myData->teamManager->RespawnPlayerRandom(player);
 }
 
 
diff --git a/Code/Game/GameLogic/Player.cpp b/Code/Game/GameLogic/Player.cpp
index 05a20503..ea66ac3d 100644
--- a/Code/Game/GameLogic/Player.cpp
+++ b/Code/Game/GameLogic/Player.cpp
@@ -6,7 +6,7 @@ using namespace GameLogic;
 using namespace Oyster::Physics;
 
 Player::Player()
-	:Object(CollisionManager::PlayerCollision, OBJECT_TYPE::OBJECT_TYPE_PLAYER)
+	:DynamicObject(CollisionManager::PlayerCollision, OBJECT_TYPE::OBJECT_TYPE_PLAYER)
 {
 	weapon = new Weapon();
 		
diff --git a/Code/Game/GameLogic/Player.h b/Code/Game/GameLogic/Player.h
index 0f080b3b..0211136a 100644
--- a/Code/Game/GameLogic/Player.h
+++ b/Code/Game/GameLogic/Player.h
@@ -6,7 +6,7 @@
 
 #include "GameLogicStates.h"
 #include "OysterMath.h"
-#include "Object.h"
+#include "DynamicObject.h"
 #include "OysterMath.h"
 #include "CollisionManager.h"
 
@@ -15,9 +15,8 @@
 namespace GameLogic
 {
 	class Weapon;
-	class Player : public Object
+	class Player : public DynamicObject
 	{
-
 	public:
 		Player(void);
 		~Player(void);