diff options
author | Stijn Buys <ingar@osirion.org> | 2009-11-14 18:05:52 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2009-11-14 18:05:52 +0000 |
commit | e61d9ba10a40c9e51d14b30b86b2b3fe853f5db8 (patch) | |
tree | 469ec5d63897744132d87397c6898fa847431a4e /src/core/zone.h | |
parent | 4293e8854a30443e4d5818fc55df404976dbfd9b (diff) |
made core::Entity and core::Zone child classes from core::Label
Diffstat (limited to 'src/core/zone.h')
-rw-r--r-- | src/core/zone.h | 24 |
1 files changed, 1 insertions, 23 deletions
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; |