Cleanup: replace a few checks with the macro IS_PLAYER

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index a296c7a1d41b7517376bf76401474568c6411040..ad0fb795a1f20667cf91e668656b22f922a5a270 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -377,7 +377,7 @@ void reset_map(float dorespawn)
                if (restart_mapalreadyrestarted || (time < game_starttime))
                {
                        //NEW: changed behaviour so that it prevents that previous spectators/observers suddenly spawn as players
-                       if (self.classname == "player") {
+                       if (IS_PLAYER(self)) {
                                //PlayerScore_Clear(self);
                                if(g_lms)
                                        PlayerScore_Add(self, SP_LMS_LIVES, LMS_NewPlayerLives());
@@ -492,7 +492,7 @@ void ReadyCount()
 
        FOR_EACH_REALCLIENT(tmp_player)
        {
-               if(tmp_player.classname == "player" || tmp_player.caplayer == 1)
+               if(IS_PLAYER(tmp_player) || tmp_player.caplayer == 1)
                {
                        ++t_players;
                        if(tmp_player.ready) { ++t_ready; }

diff --git a/qcsrc/server/mutators/gamemode_arena.qc b/qcsrc/server/mutators/gamemode_arena.qc
index 0410eb2fb2a28fb678af93cc2bc5f29f37cb8421..92c5fd6142944e7368008271cb0077550d867930 100644 (file)
--- a/qcsrc/server/mutators/gamemode_arena.qc
+++ b/qcsrc/server/mutators/gamemode_arena.qc
@@ -75,7 +75,7 @@ float Arena_CheckWinner()
        champion = world;
        FOR_EACH_CLIENT(e)
        {
-               if(e.spawned && e.classname == "player")
+               if(e.spawned && IS_PLAYER(e))
                        champion = e;
        }
 

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 2c3ab37b0410f01052ff3e499a2192353ad112f8..6ba51a0b90776400c3951f46477c6876d0e9846f 100644 (file)
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -145,7 +145,7 @@ void freezetag_Add_Score(entity attacker)
                // counted as "suicide" already
                PlayerScore_Add(self, SP_SCORE, -1);
        }
-       else if(attacker.classname == "player")
+       else if(IS_PLAYER(attacker))
        {
                // got frozen by an enemy
                // counted as "kill" and "death" already