From: terencehill <piuntn@gmail.com>
Date: Wed, 4 Jan 2017 18:41:02 +0000 (+0100)
Subject: Allow spectators to vote if sv_vote_nospectators is 1 if the game is over, not just... 
X-Git-Tag: xonotic-v0.8.2~323
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=659af223ade0881df7e5ea537fe58cc73d91767b;p=xonotic%2Fxonotic-data.pk3dir.git

Allow spectators to vote if sv_vote_nospectators is 1 if the game is over, not just if it's stopped (round has ended)
---

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index b91a8f4df..f7d3be0f0 100644
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -198,13 +198,13 @@ void VoteSpam(float notvoters, float mincount, string result)
 	}
 }
 
+#define spectators_allowed (!autocvar_sv_vote_nospectators || (autocvar_sv_vote_nospectators == 1 && (warmup_stage || intermission_running)))
+
 void VoteCount(float first_count)
 {
 	// declarations
 	vote_accept_count = vote_reject_count = vote_abstain_count = 0;
 
-	bool spectators_allowed = (!autocvar_sv_vote_nospectators || (autocvar_sv_vote_nospectators == 1 && (warmup_stage || gameover)));
-
 	float vote_player_count = 0, notvoters = 0;
 	float vote_real_player_count = 0, vote_real_accept_count = 0;
 	float vote_real_reject_count = 0, vote_real_abstain_count = 0;
@@ -753,8 +753,6 @@ void VoteCommand_call(float request, entity caller, float argc, string vote_comm
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-			bool spectators_allowed = (!autocvar_sv_vote_nospectators || (autocvar_sv_vote_nospectators == 1 && (warmup_stage || gameover)));
-
 			float tmp_playercount = 0;
 
 			vote_command = VoteCommand_extractcommand(vote_command, 2, argc);
@@ -891,8 +889,6 @@ void VoteCommand_master(float request, entity caller, float argc, string vote_co
 
 					default:  // calling a vote for master
 					{
-						bool spectators_allowed = (!autocvar_sv_vote_nospectators || (autocvar_sv_vote_nospectators == 1 && (warmup_stage || gameover)));
-
 						if (!autocvar_sv_vote_master_callable) { print_to(caller, "^1Vote to become vote master is not allowed."); }
 						else if (vote_called)
 						{