We may have only one weapon, but we can be left unarmed, and should see on the HUD...

First step: Getting the weapon name in the right place

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 303b9978e1fbe461f4d63f464015d2c4acfed3dd..03e5c04c43b4c22ab5fe11be439fa5b2837e545a 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -3049,6 +3049,12 @@ void Sbar_Draw (void)
                        Sbar_DrawXNum(pos - '144 16 0', a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                }\r
 \r
+               // weapon icon\r
+               entity e;\r
+               e = get_weaponinfo(activeweapon);\r
+               //if (e && e.netname != "")\r
+                       dprint(strcat("XX_", e.netname, "_YY\n"));\r
+\r
                // draw scores and timer\r
                Sbar_Score();\r
                Sbar_Timer();\r

diff --git a/data/qcsrc/common/items.qc b/data/qcsrc/common/items.qc
index be851a6ae6edbe6b5d221ed474c08ca18f48ab19..9c4d4db7af1578fde2795d3614b961838e8feed0 100644 (file)
--- a/data/qcsrc/common/items.qc
+++ b/data/qcsrc/common/items.qc
@@ -32,7 +32,7 @@ void register_weapons_done()
        dummy_weapon_info.classname = "weapon_info";\r
        dummy_weapon_info.weapon = 0; // you can recognize dummies by this\r
        dummy_weapon_info.weapons = 0; // you can recognize dummies by this too\r
-       dummy_weapon_info.netname = "@!#%'n Tuba";\r
+       dummy_weapon_info.netname = "N/A";\r
        dummy_weapon_info.items = 0;\r
        dummy_weapon_info.weapon_func = w_null;\r
        dummy_weapon_info.mdl = "";\r