Fix up some more FOR_EACH_PLAYER loops

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / _all.qh

diff --git a/qcsrc/server/_all.qh b/qcsrc/server/_all.qh
index cbda56873aaa9091b3774b298fc6641954f46b0b..affb8e0b4e12522603798a6e6437c2ce49ba7561 100644 (file)
--- a/qcsrc/server/_all.qh
+++ b/qcsrc/server/_all.qh
@@ -20,7 +20,7 @@ const string STR_OBSERVER = "observer";
 #define IS_VEHICLE(v) (v.vehicle_flags & VHF_ISVEHICLE)
 #define IS_TURRET(v) (v.turret_flags & TUR_FLAG_ISTURRET)
 
-#define FOR_EACH_CLIENTSLOT(v) for (v = world; (v = nextent(v)) && (num_for_edict(v) <= maxclients); )
+#define FOR_EACH_CLIENTSLOT(v) for (v = world; (v = nextent(v)) && (etof(v) <= maxclients); )
 #define FOR_EACH_CLIENT(v) FOR_EACH_CLIENTSLOT(v) if (IS_CLIENT(v))
 #define FOR_EACH_REALCLIENT(v) FOR_EACH_CLIENT(v) if (IS_REAL_CLIENT(v))
 
@@ -29,6 +29,16 @@ const string STR_OBSERVER = "observer";
 #define FOR_EACH_OBSERVER(v) FOR_EACH_CLIENT(v) if (IS_OBSERVER(v))
 #define FOR_EACH_REALPLAYER(v) FOR_EACH_REALCLIENT(v) if (IS_PLAYER(v))
 
+#define FOREACH_CLIENT(cond, body) \
+       MACRO_BEGIN { \
+               for(int i = 1; i <= maxclients; ++i) \
+               { \
+                       entity it = ftoe(i); \
+                       if(it == NULL || !IS_CLIENT(it)) continue; \
+                       if(cond) { LAMBDA(body) } \
+               } \
+       } MACRO_END
+
 #define FOR_EACH_MONSTER(v) for (v = world; (v = findflags(v, flags, FL_MONSTER)) != world; )
 
 #include "../common/effects/all.qh"