cvsignore no longer used for ages, but we can make it into a .gitignore file

[xonotic/darkplaces.git] / progs.h

diff --git a/progs.h b/progs.h
index 34aa817444eb8c4feac576f95a973c3cf200c7da..fedd19e554cd66501557b61766a0b29b1c8bf5d2 100644 (file)
--- a/progs.h
+++ b/progs.h
@@ -25,6 +25,13 @@ 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
+
 typedef struct edict_engineprivate_s
 {
        // true if this edict is unused
@@ -69,10 +76,15 @@ 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;
        void *ode_geom;
+       void *ode_joint;
        float *ode_vertex3f;
        int *ode_element3i;
        int ode_numvertices;
@@ -84,10 +96,19 @@ typedef struct edict_engineprivate_s
        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;