Scoreboard UI: remove Enter to join if no player is selected because it isn't really...

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

diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc
index 003d88391545f7fc61f66b00b4b9a71ae2704a54..b51c5761d77819902787d194525dd2301093b751 100644 (file)
--- a/qcsrc/client/hud/panel/weapons.qc
+++ b/qcsrc/client/hud/panel/weapons.qc
@@ -1,6 +1,5 @@
 #include "weapons.qh"
 
-#include <client/autocvars.qh>
 #include <client/draw.qh>
 #include <client/view.qh>
 #include <common/wepent.qh>
@@ -128,7 +127,7 @@ void HUD_Weapons()
        int weapon_count, weapon_id;
        int row, column, rows = 0, columns = 0;
        bool vertical_order = true;
-       float aspect = autocvar_hud_panel_weapons_aspect;
+       float aspect = max(0.001, autocvar_hud_panel_weapons_aspect);
 
        float timeout = autocvar_hud_panel_weapons_timeout;
        float timein_effect_length = autocvar_hud_panel_weapons_timeout_speed_in; //? 0.375 : 0);
@@ -582,6 +581,7 @@ void HUD_Weapons()
 
                                if(a > 0)
                                {
+                                       // TODO: registry handles
                                        switch (it.ammo_type)
                                        {
                                                case RES_SHELLS:  ammo_full = autocvar_hud_panel_weapons_ammo_full_shells;  break;