From 75c14fb708f20c0838d3af82507a25430708ec1c Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 10 Feb 2019 18:57:51 +0100 Subject: [PATCH] Reduce code of FOREACH_CLIENT_RANDOM --- qcsrc/server/utils.qh | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/qcsrc/server/utils.qh b/qcsrc/server/utils.qh index e4dfe2afa..a37029590 100644 --- a/qcsrc/server/utils.qh +++ b/qcsrc/server/utils.qh @@ -55,18 +55,12 @@ bool _FCR_entered = false; _FCR_entered = true; \ int _cnt = 0; \ FOREACH_CLIENT(cond, { \ - int _j = floor(random() * (_cnt + 1)); \ - if (_j == _cnt) \ - { \ - _FCR_clients[_cnt] = it; \ - } \ - else \ - { \ - _FCR_clients[_cnt] = _FCR_clients[_j]; \ - _FCR_clients[_j] = it; \ - } \ - _cnt++; \ - }); \ + int _j = floor(random() * (_cnt + 1)); \ + if (_j != _cnt) \ + _FCR_clients[_cnt] = _FCR_clients[_j]; \ + _FCR_clients[_j] = it; \ + ++_cnt; \ + }); \ for (int _i = 0; _i < _cnt; ++_i) \ { \ const noref int i = _i; \ -- 2.39.2