From 842a5e9e3a2a7ba495c38f95e433b9a5f660c626 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 10 Mar 2013 00:18:52 +0100 Subject: [PATCH] Cleanup: replace a few checks with the macro IS_PLAYER --- qcsrc/server/command/vote.qc | 4 ++-- qcsrc/server/mutators/gamemode_arena.qc | 2 +- qcsrc/server/mutators/gamemode_freezetag.qc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index a296c7a1d..ad0fb795a 100644 --- 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 0410eb2fb..92c5fd614 100644 --- 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 2c3ab37b0..6ba51a0b9 100644 --- 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 -- 2.39.2