Merge branch 'bones_was_here/warmup' into 'master'

[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 4b42b5667ea90e682fe74b5e3996ea4ff73e596c..a207b226b67a6a3259c049d0c15a948d96345f45 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -217,23 +217,23 @@ void VoteCount(float first_count)
        Nagger_VoteCountChanged();
 
        // add up all the votes from each connected client
-       FOREACH_CLIENT(IS_REAL_CLIENT(it) && IS_CLIENT(it), {
+       FOREACH_CLIENT(IS_REAL_CLIENT(it), {
                ++vote_player_count;
-               if (IS_PLAYER(it))   ++vote_real_player_count;
+               if (IS_PLAYER(it) || INGAME(it)) ++vote_real_player_count;
                switch (it.vote_selection)
                {
                        case VOTE_SELECT_REJECT:
-                       { ++vote_reject_count;
-                         { if (IS_PLAYER(it)) ++vote_real_reject_count; } break;
-                       }
+                               ++vote_reject_count;
+                               if (IS_PLAYER(it) || INGAME(it)) ++vote_real_reject_count;
+                               break;
                        case VOTE_SELECT_ACCEPT:
-                       { ++vote_accept_count;
-                         { if (IS_PLAYER(it)) ++vote_real_accept_count; } break;
-                       }
+                               ++vote_accept_count;
+                               if (IS_PLAYER(it) || INGAME(it)) ++vote_real_accept_count;
+                               break;
                        case VOTE_SELECT_ABSTAIN:
-                       { ++vote_abstain_count;
-                         { if (IS_PLAYER(it)) ++vote_real_abstain_count; } break;
-                       }
+                               ++vote_abstain_count;
+                               if (IS_PLAYER(it) || INGAME(it)) ++vote_real_abstain_count;
+                               break;
                        default: break;
                }
        });
@@ -404,7 +404,7 @@ void reset_map(bool dorespawn, bool is_fake_round_start)
                        {
                                // PlayerScore_Clear(it);
                                CS(it).killcount = 0;
-                               // stop the player from moving so that he stands still once he gets respawned
+                               // stop the player from moving so that they stand still once they get respawned
                                it.velocity = '0 0 0';
                                it.avelocity = '0 0 0';
                                CS(it).movement = '0 0 0';