Merge remote branch 'origin/master' into terencehill/essential_weapons_panel

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud.qc

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 7953c2b9aebad72243fad49fab32411cef6e0f12..043b5ea98a957b60fd2b32ae7a343b81773102ed 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -678,7 +678,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
@@ -4576,7 +4576,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)
                        {