Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/entity.h')
-rw-r--r--src/core/entity.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/entity.h b/src/core/entity.h
index b9ee6bd..da58d86 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -118,6 +118,9 @@ public:
/// base radius of the entity
inline float radius() const { return entity_radius; }
+ /// current speed of the entity in game units per second
+ inline const float speed() const { return entity_speed; }
+
/// indicates a server-side entity
inline bool serverside() const { return entity_serverside; }
@@ -249,6 +252,10 @@ public:
math::Vector3f entity_location;
math::Axis entity_axis;
+ /// speed of the entity
+ float entity_speed;
+
+
float entity_radius;
Shape entity_shape;
math::Color entity_color;
@@ -308,9 +315,6 @@ public:
/// core type id
virtual inline const unsigned int type() const { return Entity::Dynamic; }
- /// current speed of the entity in game units per second
- inline const float speed() const { return entity_speed; }
-
/// event state
inline const int state() const { return entity_state; }
@@ -349,10 +353,6 @@ public:
*/
virtual void frame(float seconds);
- /// speed of the entity
- float entity_speed;
-
-
protected:
float entity_timer;
int entity_state;