fix a severe texture corruption and crash case when using vid_dx9 1 is used with...

[xonotic/darkplaces.git] / world.h

diff --git a/world.h b/world.h
index 90c70884060461343cf4932f5a858c2c0d5926d2..18e9b00155b1bac6dec53d99449c2de3974c4ae8 100644 (file)
--- a/world.h
+++ b/world.h
@@ -46,10 +46,12 @@ typedef struct world_physics_s
        void *ode_world;
        void *ode_space;
        void *ode_contactgroup;
-       // number of constraint solver iterations to use (for dWorldStepFast)
+       // number of constraint solver iterations to use (for dWorldQuickStep)
        int ode_iterations;
        // actual step (server frametime / ode_iterations)
        vec_t ode_step;
+       // time we need to simulate, for constantstep
+       vec_t ode_time;
        // stats
        int ode_numobjects; // total objects cound
        int ode_activeovjects; // active objects count
@@ -117,6 +119,15 @@ int World_EntitiesInBox(world_t *world, const vec3_t mins, const vec3_t maxs, in
 void World_Start(world_t *world);
 void World_End(world_t *world);
 
+// physics macros
+#ifndef ODE_STATIC
+# define ODE_DYNAMIC 1
+#endif
+
+#if defined(ODE_STATIC) || defined(ODE_DYNAMIC)
+# define USEODE 1
+#endif
+
 // update physics
 // this is called by SV_Physics
 void World_Physics_Frame(world_t *world, double frametime, double gravity);