From c0c2a0ccc335b00983bf69b99b7a44505ed24b47 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Fri, 12 Nov 2010 14:43:49 +0000 Subject: made core::Entity::entity_shape a private attribute --- src/core/entity.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/core/entity.h') 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; -- cgit v1.2.3