From 38eb51c26ab0d9dbebc974c7a21f96a429ce3098 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 8 Feb 2011 16:55:23 +0000
Subject: Corrected triangle loading of collision model, added 'complex' flag
 to ships.ini to enable collision models on player ships.

---
 src/core/entity.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/core/entity.h')

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
-- 
cgit v1.2.3