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>2010-11-12 14:43:49 +0000
committerStijn Buys <ingar@osirion.org>2010-11-12 14:43:49 +0000
commitc0c2a0ccc335b00983bf69b99b7a44505ed24b47 (patch)
treeaed98bf43957595104810e6ba7d1ab278d2e8089 /src/core/entity.h
parentd07d7e0d0ba022d555f418e9a072d71c190ed225 (diff)
made core::Entity::entity_shape a private attribute
Diffstat (limited to 'src/core/entity.h')
-rw-r--r--src/core/entity.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/core/entity.h b/src/core/entity.h
index 954b261..48dd949 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -226,6 +226,11 @@ public:
/* ---- mutators -------------------------------------------------- */
+ /// assign shape
+ inline void set_shape(Shape shape) {
+ entity_shape = shape;
+ }
+
/// assign entity color
inline void set_color(const math::Color &color) {
entity_color.assign(color);
@@ -429,9 +434,6 @@ public:
/* entity_ variables can be set by the module */
- float entity_mass;
- float entity_speed;
- Shape entity_shape;
unsigned int entity_moduletypeid;
bool entity_created;
@@ -451,7 +453,11 @@ protected:
// the previous zone the entity belonged too
Zone* entity_oldzone;
+ float entity_mass;
+ float entity_speed;
+
private:
+
unsigned int entity_id;
unsigned int entity_flags;
@@ -464,6 +470,8 @@ private:
float entity_radius;
+ Shape entity_shape;
+
math::Color entity_color;
math::Color entity_color_second;