X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=progs.h;h=72813bbf4d9a93c540153414729ec826bcf05c4e;hb=e267b18ea5e1e6ab71b14db5a12a803cd0554421;hp=c3f3870e0279a9f730e2df5b9c7044217e037b81;hpb=556467b184719f636ebc0bea884afe808a238c4b;p=xonotic%2Fdarkplaces.git

diff --git a/progs.h b/progs.h
index c3f3870e..72813bbf 100644
--- a/progs.h
+++ b/progs.h
@@ -30,7 +30,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define JOINTTYPE_SLIDER 3
 #define JOINTTYPE_UNIVERSAL 4
 #define JOINTTYPE_HINGE2 5
-#define JOINTTYPE_PISTON 6
+#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
 {
@@ -76,6 +89,10 @@ typedef struct edict_engineprivate_s
 	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;
@@ -85,9 +102,11 @@ typedef struct edict_engineprivate_s
 	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;
+	float ode_friction;
 	vec3_t ode_origin;
 	vec3_t ode_velocity;
 	vec3_t ode_angles;
@@ -103,6 +122,8 @@ typedef struct edict_engineprivate_s
 	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;