Weapon priority list: fix invisible names

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / weaponslist.qc

diff --git a/qcsrc/menu/xonotic/weaponslist.qc b/qcsrc/menu/xonotic/weaponslist.qc
index adc7fc2115bb4634dbae79b6fab9236d286fa05b..c1189dd9ba5c702214c50c0ecea30e4613f713b7 100644 (file)
--- a/qcsrc/menu/xonotic/weaponslist.qc
+++ b/qcsrc/menu/xonotic/weaponslist.qc
@@ -2,16 +2,16 @@
 #define WEAPONSLIST_H
 #include "listbox.qc"
 CLASS(XonoticWeaponsList, XonoticListBox)
-       METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity))
-       METHOD(XonoticWeaponsList, toString, string(entity))
+       METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity));
+       METHOD(XonoticWeaponsList, toString, string(entity));
        ATTRIB(XonoticWeaponsList, rowsPerItem, float, 1)
-       METHOD(XonoticWeaponsList, draw, void(entity))
-       METHOD(XonoticWeaponsList, drawListBoxItem, void(entity, int, vector, bool, bool))
-       METHOD(XonoticWeaponsList, resizeNotify, void(entity, vector, vector, vector, vector))
-       METHOD(XonoticWeaponsList, keyDown, float(entity, float, float, float))
+       METHOD(XonoticWeaponsList, draw, void(entity));
+       METHOD(XonoticWeaponsList, drawListBoxItem, void(entity, int, vector, bool, bool));
+       METHOD(XonoticWeaponsList, resizeNotify, void(entity, vector, vector, vector, vector));
+       METHOD(XonoticWeaponsList, keyDown, float(entity, float, float, float));
        ATTRIB(XonoticWeaponsList, realFontSize, vector, '0 0 0')
        ATTRIB(XonoticWeaponsList, realUpperMargin, float, 0)
-       METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector))
+       METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector));
 ENDCLASS(XonoticWeaponsList)
 entity makeXonoticWeaponsList();
 void WeaponsList_MoveUp_Click(entity btn, entity me);
@@ -46,7 +46,7 @@ void WeaponsList_MoveUp_Click(entity box, entity me)
        if(me.selectedItem > 0)
        {
                cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem - 1, me.selectedItem));
-               me.selectedItem -= 1;
+               me.setSelected(me, me.selectedItem - 1);
        }
 }
 void WeaponsList_MoveDown_Click(entity box, entity me)
@@ -54,7 +54,7 @@ void WeaponsList_MoveDown_Click(entity box, entity me)
        if(me.selectedItem < me.nItems - 1)
        {
                cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem, me.selectedItem + 1));
-               me.selectedItem += 1;
+               me.setSelected(me, me.selectedItem + 1);
        }
 }
 void XonoticWeaponsList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
@@ -88,7 +88,7 @@ string XonoticWeaponsList_toString(entity me)
        for(i = 0; i < n; ++i)
        {
                e = get_weaponinfo(stof(argv(i)));
-               s = strcat(s, e.message, ", ");
+               s = strcat(s, e.m_name, ", ");
        }
        return substring(s, 0, strlen(s) - 2);
 }
@@ -103,9 +103,9 @@ void XonoticWeaponsList_drawListBoxItem(entity me, int i, vector absSize, bool i
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, me.focusedItemAlpha);
        }
        e = get_weaponinfo(stof(argv(i)));
-       string msg = e.message;
+       string msg = e.m_name;
        if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
-               msg = sprintf(_("%s (mutator weapon)"), msg);
+               msg = strcat(msg, "*");
 
        vector save_fontscale = draw_fontscale;
        float f = draw_CondensedFontFactor(msg, false, me.realFontSize, 1);