]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix condition to stop drawing weapons panel when it completely disappears
authorterencehill <piuntn@gmail.com>
Tue, 5 Feb 2013 09:51:52 +0000 (10:51 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 5 Feb 2013 09:51:52 +0000 (10:51 +0100)
qcsrc/client/hud.qc

index a5fe9372ff276de7d0f6f0db0d783045c45e7d6e..abc43ce3a4f7cdb984119e3e0c3aaf6e088cc57f 100644 (file)
@@ -468,7 +468,8 @@ void HUD_Weapons(void)
        {
                if((!autocvar_hud_panel_weapons) || (spectatee_status == -1))
                        return;
-               else if(timeout && time >= weapontime + timeout + timeout_effect_length && ((autocvar_hud_panel_weapons_timeout_effect != 1) && !(autocvar_hud_panel_weapons_timeout_fadebgmin + autocvar_hud_panel_weapons_timeout_fadefgmin)))
+               if(timeout && time >= weapontime + timeout + timeout_effect_length)
+               if(autocvar_hud_panel_weapons_timeout_effect == 3 || (autocvar_hud_panel_weapons_timeout_effect == 1 && !(autocvar_hud_panel_weapons_timeout_fadebgmin + autocvar_hud_panel_weapons_timeout_fadefgmin)))
                {
                        weaponprevtime = time;
                        return;