X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=world.h;h=9e0e01010aa18089ea5ac68a9e07258d0692109e;hb=bec702479a73a63e5454bd7aef014a8ab335e030;hp=7e20c8019614a7195359139b2b0b08b23dd4adc8;hpb=e9ef9da90a206204b283dacd15c35bd3fd1fe5c9;p=xonotic%2Fdarkplaces.git

diff --git a/world.h b/world.h
index 7e20c801..9e0e0101 100644
--- a/world.h
+++ b/world.h
@@ -23,13 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define WORLD_H
 
 #include "qtypes.h"
-#include "qdefs.h"
-#include "cvar.h"
-#include "com_list.h"
 #include "collision.h"
-#include "matrixlib.h"
-#include "r_textures.h"
-typedef struct model_s dp_model_t;
 
 #define MOVE_NORMAL     0
 #define MOVE_NOMONSTERS 1
@@ -118,7 +112,7 @@ void World_PrintAreaStats(world_t *world, const char *worldname);
 void World_UnlinkEdict(struct prvm_edict_s *ent);
 
 /// Needs to be called any time an entity changes origin, mins, maxs
-void World_LinkEdict(world_t *world, struct prvm_edict_s *ent, const vec3_t mins, const vec3_t maxs);
+void World_LinkEdict(world_t *world, struct prvm_edict_s *ent, const vec3_t mins, const vec3_t maxs, qbool link_solid_not);
 
 /// \returns list of entities touching a box
 int World_EntitiesInBox(world_t *world, const vec3_t mins, const vec3_t maxs, int maxlist, struct prvm_edict_s **list);