PF_traceline/PF_tracebox can now use world as the edict

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3931 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/todo b/todo
index 70cdb33b9647260bf6acc3f993c240bce75762b8..e2846a523f5e0b7650118d5062e65b90bf9dc228 100644 (file)
--- a/todo
+++ b/todo
@@ -34,6 +34,7 @@
 -n darkplaces: segfault reading memory in windows when starting a new server from menu (yummyluv)
 -n darkplaces: server is starting before the "port" cvar is set by commandline and scripts? (yummyluv)
 -n darkplaces: typing ip in join game menu should show 'trying' and 'no response' after a while, or 'no network' if networking is not initialized (yummyluv)
+d darkplaces: PF_traceline/PF_tracebox now work with world as the edict
 d darkplaces: make the static light built messages be developer prints (Tomaz)
 d dpmod: use Tomaz's ammo box models (Tomaz) 
 d darkplaces: make bounce check for fabs(dotproduct)<60 velocity, not dotproduct<60, so now an explosion above gibs will cause them to bounce up into the air 

diff --git a/world.c b/world.c
index 31fe0ae4483f2643d22dea9af386528d02b535ce..38fd5334d5c8a22d73e5149a11618d004d76916f 100644 (file)
--- a/world.c
+++ b/world.c
@@ -640,6 +640,10 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
        areagrid_t *grid;
        int i, igrid[3], igridmins[3], igridmaxs[3];
 
+       // if the passedict is world, make it NULL (to avoid two checks each time)
+       if (passedict == sv.edicts)
+               passedict = NULL;
+
        memset(&clip, 0, sizeof(moveclip_t));
 
        VectorCopy(start, clip.start);