X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=progs.h;h=30219148e9ecaf8ab4be5fc0363f181b3a1f3099;hp=d5e59dbfa6acff2e0d611a1a1f23accb18b0cd8e;hb=7b54444c08e4d206acaf8e302be47e6dfe1f9b7d;hpb=5aba57f18381d282c8a1be1dd5784bd94ec9f7f2

diff --git a/progs.h b/progs.h
index d5e59dbf..30219148 100644
--- a/progs.h
+++ b/progs.h
@@ -25,6 +25,26 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define ENTITYGRIDAREAS 16
 #define MAX_ENTITYCLUSTERS 16
 
+#define JOINTTYPE_POINT 1
+#define JOINTTYPE_HINGE 2
+#define JOINTTYPE_SLIDER 3
+#define JOINTTYPE_UNIVERSAL 4
+#define JOINTTYPE_HINGE2 5
+#define JOINTTYPE_FIXED -1
+
+#define ODEFUNC_ENABLE			1
+#define ODEFUNC_DISABLE			2
+#define ODEFUNC_RELFORCEATPOS	3
+#define ODEFUNC_RELTORQUE		4
+
+typedef struct edict_odefunc_s
+{
+	int type;
+	vec3_t v1;
+	vec3_t v2;
+	struct edict_odefunc_s *next;
+}edict_odefunc_t;
+
 typedef struct edict_engineprivate_s
 {
 	// true if this edict is unused
@@ -33,7 +53,7 @@ typedef struct edict_engineprivate_s
 	// mess up client interpolation or obscure severe QuakeC bugs)
 	float freetime;
 	// mark for the leak detector
-	qboolean marked;
+	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
@@ -68,6 +88,41 @@ typedef struct edict_engineprivate_s
 	// moved, in case they need to be moved back
 	vec3_t moved_from;
 	vec3_t moved_fromangles;
+
+	framegroupblend_t framegroupblend[MAX_FRAMEGROUPBLENDS];
+	frameblend_t frameblend[MAX_FRAMEBLENDS];
+	skeleton_t skeleton;
+
+	// physics parameters
+	qboolean ode_physics;
+	void *ode_body;
+	void *ode_geom;
+	void *ode_joint;
+	float *ode_vertex3f;
+	int *ode_element3i;
+	int ode_numvertices;
+	int ode_numtriangles;
+	edict_odefunc_t *ode_func;
+	vec3_t ode_mins;
+	vec3_t ode_maxs;
+	vec_t ode_mass;
+	vec3_t ode_origin;
+	vec3_t ode_velocity;
+	vec3_t ode_angles;
+	vec3_t ode_avelocity;
+	qboolean ode_gravity;
+	int ode_modelindex;
+	vec_t ode_movelimit; // smallest component of (maxs[]-mins[])
+	matrix4x4_t ode_offsetmatrix;
+	matrix4x4_t ode_offsetimatrix;
+	int ode_joint_type;
+	int ode_joint_enemy;
+	int ode_joint_aiment;
+	vec3_t ode_joint_origin; // joint anchor
+	vec3_t ode_joint_angles; // joint axis
+	vec3_t ode_joint_velocity; // second joint axis
+	vec3_t ode_joint_movedir; // parameters
+	void *ode_massbuf;
 }
 edict_engineprivate_t;