Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-09-28 18:02:06 +0000
committerStijn Buys <ingar@osirion.org>2008-09-28 18:02:06 +0000
commitf46be446304dcb2d609fcd2648fd36d3f2fda054 (patch)
tree36e194d6e2d9d8fc48d03c4b8bb56d63e12276cf /src/core/entity.h
parentfd778219e40c5fbb4d0af1839cbc313caaf10d9d (diff)
intro module groundworks
Diffstat (limited to 'src/core/entity.h')
-rw-r--r--src/core/entity.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/core/entity.h b/src/core/entity.h
index c988143..4861b07 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -155,6 +155,18 @@ public:
*/
virtual void set_zone(Zone *zone);
+ /// set the label
+ void set_label(char const *label);
+
+ /// set the label
+ void set_label(std::string const &label);
+
+ /// set the name
+ void set_name(char const *name);
+
+ /// set the name
+ void set_name(std::string const &name);
+
/// clear all update flags
virtual void clear_updates();
@@ -183,8 +195,6 @@ public:
math::Axis entity_axis;
float entity_radius;
- std::string entity_name;
- std::string entity_label;
std::string entity_modelname;
model::Model *entity_model;
Shape entity_shape;
@@ -210,6 +220,9 @@ protected:
bool entity_serverside;
+ std::string entity_name;
+ std::string entity_label;
+
private:
// add an entity to the registry
static void add(Entity *ent);