diff options
Diffstat (limited to 'src/core/entity.h')
| -rw-r--r-- | src/core/entity.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/entity.h b/src/core/entity.h index 378a71a..e12123e 100644 --- a/src/core/entity.h +++ b/src/core/entity.h @@ -173,11 +173,6 @@ public: return entity_collision_shape; } - /// physics motion info - inline btMotionState *motionstate() { - return entity_motionstate; - } - /// indicates a server-side entity inline const bool serverside() const { return entity_serverside; @@ -456,7 +451,6 @@ protected: btRigidBody *entity_body; btRigidBody::btRigidBodyConstructionInfo *entity_body_info; btCollisionShape *entity_collision_shape; - btMotionState *entity_motionstate; // the zone the entity belongs to Zone* entity_zone; @@ -536,6 +530,11 @@ public: return entity_timer; } + /// physics motion info + inline btMotionState *motionstate() { + return entity_motionstate; + } + /*----- mutators -------------------------------------------------- */ /// mass of the entity @@ -588,6 +587,7 @@ public: protected: float entity_timer; int entity_state; + btMotionState *entity_motionstate; }; /// an entity that can be controlled by a player |