Merge branch 'master' into Mario/killsound

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

diff --git a/qcsrc/server/_all.qh b/qcsrc/server/_all.qh
index 794638dea233933516ffc1ecf48c666a03929fa1..1fabe4d0f965aa9abd6b564b180ad4e83637a96d 100644 (file)
--- a/qcsrc/server/_all.qh
+++ b/qcsrc/server/_all.qh
@@ -45,29 +45,33 @@ const string STR_OBSERVER = "observer";
 
 // using the "inside out" version of knuth-fisher-yates shuffle
 // https://en.wikipedia.org/wiki/Fisher–Yates_shuffle
+entity _FCR_clients[255];
+bool _FCR_entered = false;
 #define FOREACH_CLIENT_RANDOM(cond, body) \
        MACRO_BEGIN { \
-               float _clients[255]; \
+               if (_FCR_entered) LOG_FATAL("FOREACH_CLIENT_RANDOM must not be nested"); \
+               _FCR_entered = true; \
                int _cnt = 0; \
                FOREACH_CLIENT(cond, LAMBDA( \
                        int _j = floor(random() * (_cnt + 1)); \
                        if (_j == _cnt) \
                        { \
-                               _clients[_cnt] = etof(it); \
+                               _FCR_clients[_cnt] = it; \
                        } \
                        else \
                        { \
-                               _clients[_cnt] = _clients[_j]; \
-                               _clients[_j] = etof(it); \
+                               _FCR_clients[_cnt] = _FCR_clients[_j]; \
+                               _FCR_clients[_j] = it; \
                        } \
                        _cnt++; \
                )); \
                for (int _i = 0; _i < _cnt; ++_i) \
                { \
-                       const noref int i = _clients[_i]; \
-                       ITER_CONST noref entity it = ftoe(i); \
+                       const noref int i = _i; \
+                       ITER_CONST noref entity it = _FCR_clients[i]; \
                        if (cond) { LAMBDA(body) } \
                } \
+               _FCR_entered = false; \
        } MACRO_END
 
 // NOTE: FOR_EACH_MONSTER deprecated! Use the following instead: IL_EACH(g_monsters, true, { code; });