made core::Entity and core::Zone child classes from core::Label

1 files changed, 2 insertions, 25 deletions

diff --git a/src/core/entity.h b/src/core/entity.h
index ed0b1f8..09839c8 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -27,6 +27,7 @@ class EntityControlable;
 #include "core/extension.h"
 #include "core/descriptions.h"
 #include "core/inventory.h"
+#include "core/label.h"
 #include "core/player.h"
 #include "core/zone.h"
 
@@ -34,7 +35,7 @@ namespace core
 {
 
 /// The base world entity. All gameworld entities must derive from this class.
-class Entity
+class Entity : public Label
 {
 	friend class Extension;
 
@@ -90,16 +91,6 @@ public:
 		return ((entity_flags & (unsigned int)flag) == (unsigned int)flag);
 	}
 
-	/// entity label (can not contain double quotes ")
-	inline const std::string& label() const {
-		return entity_label;
-	}
-
-	/// entity name (can not contain double qoutes ")
-	inline const std::string & name() const {
-		return entity_name;
-	}
-
 	/// pointer to the model, is used client-side
 	inline model::Model * model() {
 		return entity_model;
@@ -223,18 +214,6 @@ public:
 	 */
 	virtual void set_zone(Zone *zone);
 
-	/// set the label
-	void set_label(const char *label);
-
-	/// set the label
-	void set_label(const std::string &label);
-
-	/// set the name
-	void set_name(const char *name);
-
-	/// set the name
-	void set_name(const std::string &name);
-
 	/// set visibility
 	inline void set_visible(const bool visible = true) {
 		entity_visible = visible;
@@ -392,8 +371,6 @@ private:
 	math::Color 		entity_color;
 	math::Color 		entity_color_second;
 
-	std::string		entity_name;
-	std::string		entity_label;
 	std::string		entity_modelname;
 
 	model::Model*		entity_model;