X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fimpulse.qc;h=8a10a6d7525f5c973367b7adef18c16546cfd8a6;hb=c1389c740a4a144e46543e51296ad90ade3c365b;hp=c797c577101bab19df58bb5fdb9985293034e02f;hpb=b0210c08a287ad4631e16ddf3a83a0b0c546283f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc
index c797c5771..8a10a6d75 100644
--- a/qcsrc/server/impulse.qc
+++ b/qcsrc/server/impulse.qc
@@ -14,7 +14,7 @@
 
 #include "../common/minigames/sv_minigames.qh"
 
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 #include "../common/vehicles/sv_vehicles.qh"
 
 #include "../common/mutators/mutator/waypoints/waypointsprites.qh"
@@ -551,7 +551,7 @@ IMPULSE(navwaypoint_unreachable)
 	if (m) LOG_INFOF("%d waypoints have been marked total\n", m);
 
 	j = 0;
-	FOREACH_ENTITY_CLASS("info_player_deathmatch", true,
+	IL_EACH(g_spawnpoints, true,
 	{
 		vector org = it.origin;
 		tracebox(it.origin, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), it.origin - '0 0 512', MOVE_NOMONSTERS, NULL);
@@ -578,12 +578,12 @@ IMPULSE(navwaypoint_unreachable)
 	if (j) LOG_INFOF("%d spawnpoints have no nearest waypoint (marked by player model)\n", j);
 
 	j = 0;
-	FOREACH_ENTITY_FLAGS(flags, FL_ITEM,
+	IL_EACH(g_items, true,
 	{
 		it.effects &= ~(EF_NODEPTHTEST | EF_RED | EF_BLUE);
 		it.colormod = '0.5 0.5 0.5';
 	});
-	FOREACH_ENTITY_FLAGS(flags, FL_ITEM,
+	IL_EACH(g_items, true,
 	{
 		if (navigation_findnearestwaypoint(it, false)) continue;
 		LOG_INFO("item without waypoint: ", etos(it), " ", vtos(it.origin), "\n");
@@ -594,7 +594,7 @@ IMPULSE(navwaypoint_unreachable)
 	if (j) LOG_INFOF("%d items have no nearest waypoint and cannot be walked away from (marked with red light)\n", j);
 
 	j = 0;
-	FOREACH_ENTITY_FLAGS(flags, FL_ITEM,
+	IL_EACH(g_items, true,
 	{
 		if (navigation_findnearestwaypoint(it, true)) continue;
 		LOG_INFO("item without waypoint: ", etos(it), " ", vtos(it.origin), "\n");