X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=progs.h;h=79b5fc791c5e7ecbb7c3e3bb40c75640b1984b73;hp=c66ff4f28f1514363b48d599e9aeed6aed0e216a;hb=053eab2b23311c188d6ac08f6b44aa1be36dbbb7;hpb=9b11444784a52e3d91b41bda74aa0bfa5cdb6127

diff --git a/progs.h b/progs.h
index c66ff4f2..79b5fc79 100644
--- a/progs.h
+++ b/progs.h
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define ENTITYGRIDAREAS 16
 #define MAX_ENTITYCLUSTERS 16
 
+#ifdef USEODE
 #define	GEOMTYPE_NONE      -1
 #define	GEOMTYPE_SOLID      0
 #define	GEOMTYPE_BOX		1
@@ -64,21 +65,18 @@ typedef struct edict_odefunc_s
 	vec3_t v2;
 	struct edict_odefunc_s *next;
 }edict_odefunc_t;
+#endif
 
 typedef struct edict_engineprivate_s
 {
-	// true if this edict is unused
-	qboolean free;
-	// sv.time when the object was freed (to prevent early reuse which could
-	// mess up client interpolation or obscure severe QuakeC bugs)
-	float freetime;
 	// mark for the leak detector
 	int mark;
 	// place in the code where it was allocated (for the leak detector)
 	const char *allocation_origin;
+
 	// initially false to prevent projectiles from moving on their first frame
 	// (even if they were spawned by an synchronous client think)
-	qboolean move;
+	qbool move;
 
 	// cached cluster links for quick stationary object visibility checking
 	vec3_t cullmins, cullmaxs;
@@ -97,11 +95,11 @@ typedef struct edict_engineprivate_s
 	// baseline values
 	entity_state_t baseline;
 
-	// LordHavoc: gross hack to make floating items still work
+	// LadyHavoc: gross hack to make floating items still work
 	int suspendedinairflag;
 
 	// cached position to avoid redundant SV_CheckWaterTransition calls on monsters
-	qboolean waterposition_forceupdate; // force an update on this entity (set by SV_PushMove code for moving water entities)
+	qbool waterposition_forceupdate; // force an update on this entity (set by SV_PushMove code for moving water entities)
 	vec3_t waterposition_origin; // updates whenever this changes
 
 	// used by PushMove to keep track of where objects were before they were
@@ -113,8 +111,9 @@ typedef struct edict_engineprivate_s
 	frameblend_t frameblend[MAX_FRAMEBLENDS];
 	skeleton_t skeleton;
 
+#ifdef USEODE
 	// physics parameters
-	qboolean ode_physics;
+	qbool ode_physics;
 	void *ode_body;
 	void *ode_geom;
 	void *ode_joint;
@@ -125,13 +124,14 @@ typedef struct edict_engineprivate_s
 	edict_odefunc_t *ode_func;
 	vec3_t ode_mins;
 	vec3_t ode_maxs;
+	vec3_t ode_scale;
 	vec_t ode_mass;
 	float ode_friction;
 	vec3_t ode_origin;
 	vec3_t ode_velocity;
 	vec3_t ode_angles;
 	vec3_t ode_avelocity;
-	qboolean ode_gravity;
+	qbool ode_gravity;
 	int ode_modelindex;
 	vec_t ode_movelimit; // smallest component of (maxs[]-mins[])
 	matrix4x4_t ode_offsetmatrix;
@@ -144,6 +144,7 @@ typedef struct edict_engineprivate_s
 	vec3_t ode_joint_velocity; // second joint axis
 	vec3_t ode_joint_movedir; // parameters
 	void *ode_massbuf;
+#endif
 }
 edict_engineprivate_t;