Merge remote branch 'origin/terencehill/centerprint_fix'

diff --combined qcsrc/client/hud.qc
index 92bbc5223175722374ff81ddf32c37466898fa9e,b0604c73ae8f1d1d57554d0e78fe04ac9d9b7961..9c28bea1f343339d866c6d11191c8b4024324af4
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -641,7 -641,7 +641,7 @@@ void HUD_Weapons(void
                weapid = self.impulse;
  
                // draw background behind currently selected weapon
 -              if(self.weapon == activeweapon)
 +              if(self.weapon == switchweapon)
                        drawpic_aspect_skin(wpnpos, "weapon_current_bg", wpnsize, '1 1 1', wpnalpha, DRAWFLAG_NORMAL);
  
                // draw the weapon accuracy
@@@ -4539,7 -4539,7 +4539,7 @@@ void HUD_CenterPrint (void
        {
                if (j == CENTERPRINT_MAX_MSGS)
                        j = 0;
-               if (centerprint_expire_time[j] < time)
+               if (centerprint_expire_time[j] <= time)
                {
                        if (centerprint_countdown_num[j] && centerprint_time[j] > 0)
                        {