X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fvote.qc;h=f99c182466a535ba0273044045344df0ba748b7b;hb=84c9d49bbe408b001e8a677f763dc6c8beb1c2e3;hp=9f8ef342f2e27d44a6eae906a0b0ff0d87ea5f4a;hpb=33f0f468c592b97e20d70072016d756fcfd35f14;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 9f8ef342f..f99c18246 100644
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -23,6 +23,7 @@
 #include <server/round_handler.qh>
 #include <server/scores.qh>
 #include <server/teamplay.qh>
+#include <server/weapons/accuracy.qh>
 #include <server/world.qh>
 
 // =============================================
@@ -341,6 +342,8 @@ void reset_map(bool dorespawn)
 	{
 		if (game_stopped)
 			return;
+
+		PlayerStats_GameReport_Reset_All();
 		if (round_handler_IsActive())
 			round_handler_Reset(game_starttime);
 	}
@@ -351,8 +354,11 @@ void reset_map(bool dorespawn)
 		shuffleteams_on_reset_map = false;
 	}
 
-	FOREACH_CLIENT(IS_PLAYER(it),
-	{
+	FOREACH_CLIENT(true, {
+		if (time <= game_starttime)
+			accuracy_reset(it); // for spectators too because weapon accuracy is persistent
+		if (!IS_PLAYER(it))
+			continue;
 		if (STAT(FROZEN, it))
 			Unfreeze(it, false);
 		player_powerups_remove_all(it);
@@ -444,8 +450,6 @@ void ReadyRestart_force()
 	FOREACH_CLIENT(IS_PLAYER(it), {
 		it.alivetime = 0;
 		CS(it).killcount = 0;
-		float val = PlayerStats_GameReport_Event_Player(it, PLAYERSTATS_ALIVETIME, 0);
-		PlayerStats_GameReport_Event_Player(it, PLAYERSTATS_ALIVETIME, -val);
 	});
 
 	restart_mapalreadyrestarted = false; // reset this var, needed when cvar sv_ready_restart_repeatable is in use
@@ -715,7 +719,11 @@ int VoteCommand_parse(entity caller, string vote_command, string vote_list, floa
 				vote_parsed_command = strcat(first_command, " # ", ftos(etof(victim)), " ", command_arguments);
 				vote_parsed_display = sprintf("^1%s #%d ^7%s^1 %s", first_command, etof(victim), victim.netname, reason);
 			}
-			else { print_to(caller, strcat("vcall: ", GetClientErrorString(accepted, argv(startpos + 1)), ".\n")); return 0; }
+			else
+			{
+				print_to(caller, strcat("vcall: ", GetClientErrorString(accepted, argv(startpos + 1)), ".\n"));
+				return 0;
+			}
 
 			break;
 		}
@@ -803,7 +811,9 @@ void VoteCommand_abstain(int request, entity caller)  // CLIENT ONLY
 				print_to(caller, "^1You abstained from your vote.");
 				caller.vote_selection = VOTE_SELECT_ABSTAIN;
 				msg_entity = caller;
-				if (!autocvar_sv_vote_singlecount)   VoteCount(false); }
+				if (!autocvar_sv_vote_singlecount)
+					VoteCount(false);
+			}
 
 			return;
 		}