Adding developer_curl to print verbose curl output

[xonotic/darkplaces.git] / world.h

diff --git a/world.h b/world.h
index 18e9b00155b1bac6dec53d99449c2de3974c4ae8..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,14 +36,14 @@ 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;
@@ -119,15 +120,6 @@ 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);