Merge branch 'master' into z411/bai-server

diff --cc qcsrc/client/announcer.qc
index 81b04b89e724a853b7eeb9fbb819c8cd2a32570c,5baaddeffe659fe95552824a287e526088ab7c90..04a6db8631fd9651f9cb112cbae182fffc622175
--- 1/qcsrc/client/announcer.qc
--- 2/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/command/vote.qc
Simple merge

diff --cc qcsrc/server/weapons/accuracy.qc
index 4482fc9fdbd2142cae8387a4df8c0286b37fa2ec,337ae54a98c86d4b889bb03da4b1cac0439116ee..8005506179bbae8ae813bfbe14fd819f5ed488e6
--- 1/qcsrc/server/weapons/accuracy.qc
--- 2/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)
  {

diff --cc qcsrc/server/weapons/accuracy.qh
Simple merge