Remove useless/redundant code

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / nades / nades.qc

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 050e4dbc5ef4d410f17293f678ce9b5d0a38ac9c..599edf926569f4e805c86df4f834d685e79761c4 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -1345,27 +1345,25 @@ MUTATOR_HOOKFUNCTION(nades, PlayerPreThink)
        {
                int n = 0;
 
-               entity reviving_players_last = NULL;
-               entity reviving_players_first = NULL;
+               entity revivers_last = NULL;
+               entity revivers_first = NULL;
 
-               if(player.freezetag_frozen_timeout > 0 && time >= player.freezetag_frozen_timeout)
-                       n = -1;
-               else if (STAT(FROZEN, player) == FROZEN_TEMP_DYING)
+               if (STAT(FROZEN, player) == FROZEN_TEMP_DYING)
                {
                        vector revive_extra_size = '1 1 1' * autocvar_g_freezetag_revive_extra_size;
                        n = 0;
                        FOREACH_CLIENT(IS_PLAYER(it) && IN_REVIVING_RANGE(player, it, revive_extra_size), {
                                if (STAT(FROZEN, it))
                                        continue;
-                               if (reviving_players_last)
-                                       reviving_players_last.chain = it;
-                               reviving_players_last = it;
-                               if (!reviving_players_first)
-                                       reviving_players_first = it;
+                               if (revivers_last)
+                                       revivers_last.chain = it;
+                               revivers_last = it;
+                               if (!revivers_first)
+                                       revivers_first = it;
                                ++n;
                        });
-                       if (reviving_players_last)
-                               reviving_players_last.chain = NULL;
+                       if (revivers_last)
+                               revivers_last.chain = NULL;
                }
 
                if (n > 0 && STAT(FROZEN, player) == FROZEN_TEMP_DYING) // OK, there is at least one teammate reviving us
@@ -1377,12 +1375,11 @@ MUTATOR_HOOKFUNCTION(nades, PlayerPreThink)
                        {
                                Unfreeze(player, false);
 
-                               entity first = reviving_players_first;
-                               Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_FREEZETAG_REVIVED, first.netname);
-                               Send_Notification(NOTIF_ONE, first, MSG_CENTER, CENTER_FREEZETAG_REVIVE, player.netname);
+                               Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_FREEZETAG_REVIVED, revivers_first.netname);
+                               Send_Notification(NOTIF_ONE, revivers_first, MSG_CENTER, CENTER_FREEZETAG_REVIVE, player.netname);
                        }
 
-                       for(entity it = reviving_players_first; it; it = it.chain)
+                       for(entity it = revivers_first; it; it = it.chain)
                                STAT(REVIVE_PROGRESS, it) = STAT(REVIVE_PROGRESS, player);
                }
        }