X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fvote.qc;h=fdb53ace94e1f5b3b11d5aaeb0c621ab03ae776d;hp=01ecd78979b35922b2bd302e85ec7ab0a059f685;hb=498bd21f83049cfcca6e5336cb23c4fdef15ff92;hpb=9531e6a07b13cbccf27113f1dcb6e5ccacc6fbb4

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 01ecd7897..fdb53ace9 100644
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -326,9 +326,7 @@ void reset_map(float dorespawn)
 	if(time <= game_starttime && round_handler_IsActive())
 		round_handler_Reset(game_starttime);
 
-	if(g_race || g_cts)
-		race_ReadyRestart();
-	else MUTATOR_CALLHOOK(reset_map_global);
+	MUTATOR_CALLHOOK(reset_map_global);
 
 	for(self = world; (self = nextent(self)); )
 	if(IS_NOT_A_CLIENT(self))
@@ -463,7 +461,7 @@ void ReadyRestart_force()
 void ReadyRestart()
 {
 	// no arena, assault support yet...
-	if(g_arena | g_assault | gameover | intermission_running | race_completing)
+	if(g_assault | gameover | intermission_running | race_completing)
 		localcmd("restart\n");
 	else
 		localcmd("\nsv_hook_gamerestart\n");
@@ -668,10 +666,10 @@ float VoteCommand_parse(entity caller, string vote_command, string vote_list, fl
 
 	first_command = argv(startpos);
 
-	/*dprint(sprintf("VoteCommand_parse(): Command: '%s', Length: %f.\n",
+	/*printf("VoteCommand_parse(): Command: '%s', Length: %f.\n",
 		substring(vote_command, argv_start_index(startpos), strlen(vote_command) - argv_start_index(startpos)),
 		strlen(substring(vote_command, argv_start_index(startpos), strlen(vote_command) - argv_start_index(startpos)))
-	));*/
+	);*/
 
 	if(
 		(autocvar_sv_vote_limit > 0)
@@ -1013,7 +1011,7 @@ void VoteCommand_yes(float request, entity caller) // CLIENT ONLY
 		case CMD_REQUEST_COMMAND:
 		{
 			if (!vote_called) { print_to(caller, "^1No vote called."); }
-			else if(caller.vote_selection != VOTE_SELECT_NULL && autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
+			else if(caller.vote_selection != VOTE_SELECT_NULL && !autocvar_sv_vote_change) { print_to(caller, "^1You have already voted."); }
 
 			else // everything went okay, continue changing vote
 			{