From e61d9ba10a40c9e51d14b30b86b2b3fe853f5db8 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sat, 14 Nov 2009 18:05:52 +0000
Subject: made core::Entity and core::Zone child classes from core::Label

---
 src/core/zone.h | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'src/core/zone.h')

diff --git a/src/core/zone.h b/src/core/zone.h
index 6048a99..c96f7f9 100644
--- a/src/core/zone.h
+++ b/src/core/zone.h
@@ -24,7 +24,7 @@ namespace core
 {
 
 /// a Zone contains a compartment of the game universe
-class Zone
+class Zone : public Label
 {
 public:
 	/// type definition for the content of a zone
@@ -85,16 +85,6 @@ public:
 		return zone_id;
 	}
 
-	/// zone label
-	inline std::string const & label() const {
-		return zone_label;
-	}
-
-	/// zone name
-	inline std::string const & name() const {
-		return zone_name;
-	}
-
 	/// the name of the texture to be used as sky for this zone
 	inline std::string const & sky() const {
 		return zone_sky;
@@ -124,16 +114,6 @@ public:
 
 	/* ---- mutators ------------------------------------------- */
 
-	/// set the Zone label
-	inline void set_label(std::string const & label) {
-		zone_label.assign(label);
-	}
-
-	/// set the Zone label
-	inline void set_name(std::string const & name) {
-		zone_name.assign(name);
-	}
-
 	/// set the sky texture name to be used for this zone
 	inline void set_sky(std::string const & sky) {
 		zone_sky.assign(sky);
@@ -173,8 +153,6 @@ public:
 private:
 	unsigned int		zone_id;
 
-	std::string		zone_label;
-	std::string		zone_name;
 	std::string		zone_sky;
 
 	size_t			zone_sky_texture;
-- 
cgit v1.2.3