]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Fixes.
authorRudolf Polzer <divverent@xonotic.org>
Fri, 3 Jan 2014 13:59:43 +0000 (14:59 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 3 Jan 2014 13:59:43 +0000 (14:59 +0100)
sv_phys.c
world.c

index 37d63575d2dc413d1a81c7ad7dab9100eba3f4be..dd8cd9845497240426979208c41944ebdfbee725 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -751,7 +751,6 @@ int SV_EntitiesInBox(const vec3_t mins, const vec3_t maxs, int maxedicts, prvm_e
 
 int SV_EntitiesInBoxNearLine(const vec3_t mins, const vec3_t maxs, const vec3_t start, const vec3_t end, vec_t distance, int maxedicts, prvm_edict_t **resultedicts)
 {
-       prvm_prog_t *prog = SVVM_prog;
        vec3_t paddedmins, paddedmaxs;
        if (sv_areadebug.integer)
                return SV_EntitiesInBox(mins, maxs, maxedicts, resultedicts);
diff --git a/world.c b/world.c
index 376fc997ba9b4714fd840dd2b239ab33982180c0..41d14897f9b736127abce078130b3e5d875c0775 100644 (file)
--- a/world.c
+++ b/world.c
@@ -366,7 +366,7 @@ int World_EntitiesInBoxNearLine(world_t *world, const vec3_t requestmins, const
                                maxs[1] = mins[1] + 1.0 / world->areagrid_scale[1];
                                //maxs[2] = mins[2] + 1.0 / world->areagrid_scale[2];
                                maxs[2] = world->areagrid_maxs[2];
-                               if (IsNearLine(mins, maxs, requeststart, requestend, requestdistance))
+                               if (!IsNearLine(mins, maxs, requeststart, requestend, requestdistance))
                                        continue;
                                for (l = grid->next;l != grid;l = l->next)
                                {