Fix a typo in DrawQ_RotPic which broke it badly.

[xonotic/darkplaces.git] / progs.h

diff --git a/progs.h b/progs.h
index 72813bbf4d9a93c540153414729ec826bcf05c4e..ed09789348b875603afea26860077ed1edbae2b7 100644 (file)
--- a/progs.h
+++ b/progs.h
@@ -25,17 +25,37 @@ 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        GEOMTYPE_NONE      -1
+#define        GEOMTYPE_SOLID      0
+#define        GEOMTYPE_BOX            1
+#define        GEOMTYPE_SPHERE         2
+#define        GEOMTYPE_CAPSULE        3
+#define        GEOMTYPE_TRIMESH        4
+#define        GEOMTYPE_CYLINDER       5
+#define        GEOMTYPE_CAPSULE_X      6
+#define        GEOMTYPE_CAPSULE_Y      7
+#define        GEOMTYPE_CAPSULE_Z      8
+#define        GEOMTYPE_CYLINDER_X     9
+#define        GEOMTYPE_CYLINDER_Y     10
+#define        GEOMTYPE_CYLINDER_Z     11
+
+#define JOINTTYPE_NONE      0
+#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 JOINTTYPE_HINGE2    5
+#define JOINTTYPE_FIXED    -1
 
-#define ODEFUNC_ENABLE                 1
-#define ODEFUNC_DISABLE                        2
-#define ODEFUNC_RELFORCEATPOS  3
-#define ODEFUNC_RELTORQUE              4
+#define FORCETYPE_NONE       0
+#define FORCETYPE_FORCE      1
+#define FORCETYPE_FORCEATPOS 2
+#define FORCETYPE_TORQUE     3
+
+#define ODEFUNC_ENABLE         1
+#define ODEFUNC_DISABLE                2
+#define ODEFUNC_FORCE       3
+#define ODEFUNC_TORQUE      4
 
 typedef struct edict_odefunc_s
 {
@@ -105,6 +125,7 @@ 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;