From: z411 <z411@omaera.org>
Date: Fri, 14 Jan 2022 04:09:39 +0000 (-0300)
Subject: Merge branch 'master' into z411/bai-server
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=870cd8f8abbbca61876860289baa9fda48a3b85c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into z411/bai-server
---

870cd8f8abbbca61876860289baa9fda48a3b85c
diff --cc qcsrc/server/command/vote.qc
index 466d85f72,d1be9e9b2..eee028ff3
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@@ -797,24 -760,12 +797,25 @@@ int VoteCommand_parse(entity caller, st
  			break;
  		}
  
 +		case "gg":
 +		case "shuffleteams":
 +		case "endmatch":
 +		{
 +			// add a delay so that vote result can be seen and announcer can be heard
 +			// if the vote is accepted
 +			vote_parsed_command = strcat("defer 2 ", vote_command);
 +			vote_parsed_display = strzone(strcat("^1", vote_command));
 +			
 +			break;
 +		}
 +
 +		case "reset":
- 		case "restart":
- 		case "resetmatch":  // re-direct all match restarting to resetmatch
+ 		case "restart": // re-direct all match restarting to resetmatch
+ 			vote_command = "resetmatch"; // fall-through
+ 		case "resetmatch":
  		{
- 			vote_parsed_command = "defer 2 resetmatch";
- 			vote_parsed_display = strzone("^1resetmatch");
 -			vote_parsed_command = vote_command;
++			vote_parsed_command = strcat("defer 2 ", vote_command);
+ 			vote_parsed_display = strzone(strcat("^1", vote_command));
  
  			break;
  		}