Merge branch 'master' into terencehill/ca_arena_mutators

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / vote.qc

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; }