From 966443be3d64fa9f9b18b1c9efa6c9af52ed785f Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Wed, 5 Nov 2014 23:02:14 +1100
Subject: [PATCH] CharacterData inherits from Entity

---
 server/characters/character_data.hpp | 18 ++----------------
 server/characters/makefile           |  2 +-
 server/doors/door_data.hpp           |  2 +-
 server/monsters/monster_data.hpp     |  2 +-
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/server/characters/character_data.hpp b/server/characters/character_data.hpp
index edc3d01..aad302c 100644
--- a/server/characters/character_data.hpp
+++ b/server/characters/character_data.hpp
@@ -24,27 +24,18 @@
 
 //components
 #include "character_defines.hpp"
-#include "vector2.hpp"
+#include "entity.hpp"
 #include "statistics.hpp"
 
 //std namespace
 #include <string>
 #include <cmath>
 
-class CharacterData {
+class CharacterData: public Entity {
 public:
 	CharacterData() = default;
 	~CharacterData() = default;
 
-	//location and movement
-	int SetRoomIndex(int i) { return roomIndex = i; }
-	Vector2 SetOrigin(Vector2 v) { return origin = v; }
-	Vector2 SetMotion(Vector2 v) { return motion = v; }
-
-	int GetRoomIndex() { return roomIndex; }
-	Vector2 GetOrigin() { return origin; }
-	Vector2 GetMotion() { return motion; }
-
 	//accessors and mutators
 	Statistics* GetBaseStats() { return &baseStats; }
 
@@ -56,11 +47,6 @@ public:
 private:
 	friend class CharacterManager;
 
-	//world position
-	int roomIndex = 0;
-	Vector2 origin = {0.0,0.0};
-	Vector2 motion = {0.0,0.0};
-
 	Statistics baseStats;
 
 	int owner;
diff --git a/server/characters/makefile b/server/characters/makefile
index 7133d20..7e666d5 100644
--- a/server/characters/makefile
+++ b/server/characters/makefile
@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../server_utilities ../../common/gameplay ../../common/utilities
+INCLUDES+=. ../entities ../server_utilities ../../common/gameplay ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
 
diff --git a/server/doors/door_data.hpp b/server/doors/door_data.hpp
index e6d3b53..62f5615 100644
--- a/server/doors/door_data.hpp
+++ b/server/doors/door_data.hpp
@@ -27,7 +27,7 @@
 
 #include <string>
 
-class DoorData: Entity {
+class DoorData: public Entity {
 public:
 	DoorData() = default;
 	~DoorData() = default;
diff --git a/server/monsters/monster_data.hpp b/server/monsters/monster_data.hpp
index 1e1fcb2..a98daa7 100644
--- a/server/monsters/monster_data.hpp
+++ b/server/monsters/monster_data.hpp
@@ -27,7 +27,7 @@
 
 #include <string>
 
-class MonsterData: Entity {
+class MonsterData: public Entity {
 public:
 	MonsterData() = default;
 	~MonsterData() = default;