From: z411 <z411@omaera.org>
Date: Wed, 22 Dec 2021 00:26:53 +0000 (-0300)
Subject: Merge branch 'master' into z411/bai-server
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=00651cf7a86d1b0774a680284c6716e7709c2125;p=xonotic%2Fxonotic-data.pk3dir.git

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

00651cf7a86d1b0774a680284c6716e7709c2125
diff --cc qcsrc/client/announcer.qc
index 81b04b89e,5baaddeff..04a6db863
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@@ -37,24 -28,13 +37,16 @@@ void Announcer_Countdown(entity this
  		announcer_countdown = NULL;
  		return;
  	}
 +
- 	//if(roundstarttime >= starttime)
- 	//	starttime = roundstarttime;
  	if(starttime <= time && roundstarttime != starttime) // game start time has passed
  		announcer_5min = announcer_1min = false; // reset maptime announcers now as well
  
- 	if(roundstarttime && time >= starttime) {
- 		rounds = true;
- 		countdown = (roundstarttime - time);
- 	} else {
- 		rounds = false;
- 		countdown = (starttime - time);
- 	}
- 	
+ 	bool inround = (roundstarttime && time >= starttime);
+ 	float countdown = (inround ? roundstarttime - time : starttime - time);
  	float countdown_rounded = floor(0.5 + countdown);
  
 +	if(time >= starttime) centerprint_ClearTitle();
 +	
  	if(countdown <= 0) // countdown has finished, starttime is now
  	{
  		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
diff --cc qcsrc/server/weapons/accuracy.qc
index 4482fc9fd,337ae54a9..800550617
--- a/qcsrc/server/weapons/accuracy.qc
+++ b/qcsrc/server/weapons/accuracy.qc
@@@ -71,9 -53,23 +71,24 @@@ void accuracy_init(entity e
  void accuracy_free(entity e)
  {
  	delete(CS(e).accuracy);
 +	delete(e.roundaccuracy);
  }
  
+ void accuracy_reset(entity e)
+ {
+ 	entity a = CS(e).accuracy;
+ 	if (!a) return;
+ 
+ 	for (int i = 0; i < REGISTRY_MAX(Weapons); i++)
+ 	{
+ 		a.accuracy_frags[i] = 0;
+ 		a.accuracy_hit[i] = 0;
+ 		a.accuracy_fired[i] = 0;
+ 		a.accuracy_cnt_hit[i] = 0;
+ 		a.accuracy_cnt_fired[i] = 0;
+ 	}
+ }
+ 
  // force a resend of a player's accuracy stats
  void accuracy_resend(entity e)
  {