Fix a bunch of loops in freezetag

diff --git a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
index ad52c13e4c7bb1e2b93f6659ad8cc87f12fd7b29..b018baca089cab9e5458707557ac5be90315dca4 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_freezetag.qc
@@ -70,25 +70,22 @@ void freezetag_ScoreRules(float teams)
 
 void freezetag_count_alive_players()
 {
-       entity e;
        total_players = redalive = bluealive = yellowalive = pinkalive = 0;
-       FOR_EACH_PLAYER(e)
-       {
-               switch(e.team)
+       FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
+               switch(it.team)
                {
-                       case NUM_TEAM_1: ++total_players; if(e.health >= 1 && e.frozen != 1) ++redalive; break;
-                       case NUM_TEAM_2: ++total_players; if(e.health >= 1 && e.frozen != 1) ++bluealive; break;
-                       case NUM_TEAM_3: ++total_players; if(e.health >= 1 && e.frozen != 1) ++yellowalive; break;
-                       case NUM_TEAM_4: ++total_players; if(e.health >= 1 && e.frozen != 1) ++pinkalive; break;
+                       case NUM_TEAM_1: ++total_players; if(it.health >= 1 && it.frozen != 1) ++redalive; break;
+                       case NUM_TEAM_2: ++total_players; if(it.health >= 1 && it.frozen != 1) ++bluealive; break;
+                       case NUM_TEAM_3: ++total_players; if(it.health >= 1 && it.frozen != 1) ++yellowalive; break;
+                       case NUM_TEAM_4: ++total_players; if(it.health >= 1 && it.frozen != 1) ++pinkalive; break;
                }
-       }
-       FOR_EACH_REALCLIENT(e)
-       {
-               e.redalive_stat = redalive;
-               e.bluealive_stat = bluealive;
-               e.yellowalive_stat = yellowalive;
-               e.pinkalive_stat = pinkalive;
-       }
+       ));
+       FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(
+               it.redalive_stat = redalive;
+               it.bluealive_stat = bluealive;
+               it.yellowalive_stat = yellowalive;
+               it.pinkalive_stat = pinkalive;
+       ));
 
        eliminatedPlayers.SendFlags |= 1;
 }
@@ -150,16 +147,14 @@ float freezetag_getWinnerTeam()
 
 float freezetag_CheckWinner()
 {
-       entity e;
        if(round_handler_GetEndTime() > 0 && round_handler_GetEndTime() - time <= 0)
        {
                Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_OVER);
                Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_OVER);
-               FOR_EACH_PLAYER(e)
-               {
-                       e.freezetag_frozen_timeout = 0;
-                       nades_Clear(e);
-               }
+               FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
+                       it.freezetag_frozen_timeout = 0;
+                       nades_Clear(it);
+               ));
                round_handler_Init(5, autocvar_g_freezetag_warmup, autocvar_g_freezetag_round_timelimit);
                return 1;
        }
@@ -167,8 +162,7 @@ float freezetag_CheckWinner()
        if(FREEZETAG_ALIVE_TEAMS() > 1)
                return 0;
 
-       float winner_team;
-       winner_team = freezetag_getWinnerTeam();
+       int winner_team = freezetag_getWinnerTeam();
        if(winner_team > 0)
        {
                Send_Notification(NOTIF_ALL, world, MSG_CENTER, APP_TEAM_NUM_4(winner_team, CENTER_ROUND_TEAM_WIN_));
@@ -181,29 +175,26 @@ float freezetag_CheckWinner()
                Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_TIED);
        }
 
-       FOR_EACH_PLAYER(e)
-       {
-               e.freezetag_frozen_timeout = 0;
-               nades_Clear(e);
-       }
+       FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
+               it.freezetag_frozen_timeout = 0;
+               nades_Clear(it);
+       ));
        round_handler_Init(5, autocvar_g_freezetag_warmup, autocvar_g_freezetag_round_timelimit);
        return 1;
 }
 
 entity freezetag_LastPlayerForTeam()
 {SELFPARAM();
-       entity pl, last_pl = world;
-       FOR_EACH_PLAYER(pl)
-       {
-               if(pl.health >= 1)
-               if(!pl.frozen)
-               if(pl != self)
-               if(pl.team == self.team)
+       entity last_pl = world;
+       FOREACH_CLIENT(IS_PLAYER(it) && it != self, LAMBDA(
+               if(it.health >= 1)
+               if(!it.frozen)
+               if(SAME_TEAM(it, self))
                if(!last_pl)
-                       last_pl = pl;
+                       last_pl = it;
                else
                        return world;
-       }
+       ));
        return last_pl;
 }
 
@@ -276,35 +267,27 @@ void() havocbot_role_ft_offense;
 
 void havocbot_goalrating_freeplayers(float ratingscale, vector org, float sradius)
 {SELFPARAM();
-       entity head;
        float distance;
 
-       FOR_EACH_PLAYER(head)
-       {
-               if ((head != self) && (head.team == self.team))
+       FOREACH_CLIENT(IS_PLAYER(it) && it != self && SAME_TEAM(it, self), LAMBDA(
+               if (it.frozen == 1)
                {
-                       if (head.frozen == 1)
-                       {
-                               distance = vlen(head.origin - org);
-                               if (distance > sradius)
-                                       continue;
-                               navigation_routerating(head, ratingscale, 2000);
-                       }
-                       else
-                       {
-                               // If teamate is not frozen still seek them out as fight better
-                               // in a group.
-                               navigation_routerating(head, ratingscale/3, 2000);
-                       }
+                       distance = vlen(it.origin - org);
+                       if (distance > sradius)
+                               continue;
+                       navigation_routerating(it, ratingscale, 2000);
                }
-       }
+               else
+               {
+                       // If teamate is not frozen still seek them out as fight better
+                       // in a group.
+                       navigation_routerating(it, ratingscale/3, 2000);
+               }
+       ));
 }
 
 void havocbot_role_ft_offense()
 {SELFPARAM();
-       entity head;
-       float unfrozen;
-
        if(self.deadflag != DEAD_NO)
                return;
 
@@ -312,12 +295,8 @@ void havocbot_role_ft_offense()
                self.havocbot_role_timeout = time + random() * 10 + 20;
 
        // Count how many players on team are unfrozen.
-       unfrozen = 0;
-       FOR_EACH_PLAYER(head)
-       {
-               if ((head.team == self.team) && (head.frozen != 1))
-                       unfrozen++;
-       }
+       int unfrozen = 0;
+       FOREACH_CLIENT(IS_PLAYER(it) && SAME_TEAM(it, self) && !(it.frozen != 1), LAMBDA(unfrozen++));
 
        // If only one left on team or if role has timed out then start trying to free players.
        if (((unfrozen == 0) && (!self.frozen)) || (time > self.havocbot_role_timeout))
@@ -475,15 +454,13 @@ MUTATOR_HOOKFUNCTION(ft, PlayerSpawn)
 
 MUTATOR_HOOKFUNCTION(ft, reset_map_players)
 {SELFPARAM();
-       entity e;
-       FOR_EACH_PLAYER(e)
-       {
-               e.killcount = 0;
-               e.freezetag_frozen_timeout = -1;
-               setself(e);
+       FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
+               it.killcount = 0;
+               it.freezetag_frozen_timeout = -1;
+               setself(it);
                PutClientInServer();
-               e.freezetag_frozen_timeout = 0;
-       }
+               it.freezetag_frozen_timeout = 0;
+       ));
        freezetag_count_alive_players();
        return 1;
 }
@@ -496,8 +473,6 @@ MUTATOR_HOOKFUNCTION(ft, GiveFragsForKill, CBC_ORDER_FIRST)
 
 MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST)
 {SELFPARAM();
-       float n;
-
        if(gameover)
                return 1;
 
@@ -511,6 +486,8 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST)
        if(!round_handler_IsRoundStarted())
                return 1;
 
+       int n;
+
        entity o;
        o = world;
        //if(self.frozen)
@@ -523,19 +500,20 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST)
        {
                vector revive_extra_size = '1 1 1' * autocvar_g_freezetag_revive_extra_size;
                n = 0;
-               FOR_EACH_PLAYER(other)
-               if(self != other)
-               if(other.frozen == 0)
-               if(other.deadflag == DEAD_NO)
-               if(SAME_TEAM(other, self))
-               if(boxesoverlap(self.absmin - revive_extra_size, self.absmax + revive_extra_size, other.absmin, other.absmax))
-               {
-                       if(!o)
-                               o = other;
-                       if(self.frozen == 1)
-                               other.reviving = true;
-                       ++n;
-               }
+               FOREACH_CLIENT(IS_PLAYER(it) && it != self, LAMBDA(
+                       if(it.frozen == 0)
+                       if(it.deadflag == DEAD_NO)
+                       if(SAME_TEAM(it, self))
+                       if(boxesoverlap(self.absmin - revive_extra_size, self.absmax + revive_extra_size, it.absmin, it.absmax))
+                       {
+                               if(!o)
+                                       o = it;
+                               if(self.frozen == 1)
+                                       it.reviving = true;
+                               ++n;
+                       }
+               ));
+                       
        }
 
        if(n && self.frozen == 1) // OK, there is at least one teammate reviving us
@@ -556,30 +534,21 @@ MUTATOR_HOOKFUNCTION(ft, PlayerPreThink, CBC_ORDER_FIRST)
                        }
 
                        // EVERY team mate nearby gets a point (even if multiple!)
-                       FOR_EACH_PLAYER(other)
-                       {
-                               if(other.reviving)
-                               {
-                                       PlayerScore_Add(other, SP_FREEZETAG_REVIVALS, +1);
-                                       PlayerScore_Add(other, SP_SCORE, +1);
-
-                                       nades_GiveBonus(other,autocvar_g_nades_bonus_score_low);
-                               }
-                       }
+                       FOREACH_CLIENT(IS_PLAYER(it) && it.reviving, LAMBDA(
+                               PlayerScore_Add(it, SP_FREEZETAG_REVIVALS, +1);
+                               PlayerScore_Add(it, SP_SCORE, +1);
+                               nades_GiveBonus(it,autocvar_g_nades_bonus_score_low);
+                       ));
 
                        Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_FREEZETAG_REVIVED, o.netname);
                        Send_Notification(NOTIF_ONE, o, MSG_CENTER, CENTER_FREEZETAG_REVIVE, self.netname);
                        Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_REVIVED, self.netname, o.netname);
                }
 
-               FOR_EACH_PLAYER(other)
-               {
-                       if(other.reviving)
-                       {
-                               other.revive_progress = self.revive_progress;
-                               other.reviving = false;
-                       }
-               }
+               FOREACH_CLIENT(IS_PLAYER(it) && it.reviving, LAMBDA(
+                       it.revive_progress = self.revive_progress;
+                       it.reviving = false;
+               ));
        }
        else if(!n && self.frozen == 1) // only if no teammate is nearby will we reset
        {