qdefs: Define separate FLOAT_ and DOUBLE_ versions of lossless format and true for...

[xonotic/darkplaces.git] / world.h

diff --git a/world.h b/world.h
index 334420fbff9599d29012044e417b139dadf4be51..1b60ac6c2b48cbd74db530237db1db418e98ec4d 100644 (file)
--- a/world.h
+++ b/world.h
@@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef WORLD_H
 #define WORLD_H
 
+#include "qtypes.h"
 #include "collision.h"
 
 #define MOVE_NORMAL     0
@@ -35,21 +36,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 typedef struct link_s
 {
+       llist_t list;
        int entitynumber;
-       struct link_s   *prev, *next;
 } link_t;
 
 typedef struct world_physics_s
 {
        // for ODE physics engine
-       qboolean ode; // if true then ode is activated
+       qbool ode; // if true then ode is activated
        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
@@ -59,12 +62,15 @@ typedef struct world_physics_s
 }
 world_physics_t;
 
+struct prvm_prog_s;
+
 typedef struct world_s
 {
        // convenient fields
        char filename[MAX_QPATH];
        vec3_t mins;
        vec3_t maxs;
+       struct prvm_prog_s *prog;
 
        int areagrid_stats_calls;
        int areagrid_stats_nodechecks;
@@ -95,7 +101,7 @@ void World_Init(void);
 void World_Shutdown(void);
 
 /// called after the world model has been loaded, before linking any entities
-void World_SetSize(world_t *world, const char *filename, const vec3_t mins, const vec3_t maxs);
+void World_SetSize(world_t *world, const char *filename, const vec3_t mins, const vec3_t maxs, struct prvm_prog_s *prog);
 /// unlinks all entities (used before reallocation of edicts)
 void World_UnlinkAll(world_t *world);
 
@@ -121,7 +127,7 @@ void World_Physics_Frame(world_t *world, double frametime, double gravity);
 // change physics properties of entity
 struct prvm_edict_s;
 struct edict_odefunc_s;
-//void World_Physics_ApplyCmd(prvm_edict_s *ed, edict_odefunc_s *f);
+void World_Physics_ApplyCmd(struct prvm_edict_s *ed, struct edict_odefunc_s *f);
 
 // remove physics data from entity
 // this is called by entity removal