Menu: avoid loading font twice on resolution switch; avoid extra r_restart on resolut...

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

diff --git a/qcsrc/menu/xonotic/weaponslist.c b/qcsrc/menu/xonotic/weaponslist.c
index d800005e382bdfb85d51314e2b3ca3b0dc4c87c6..6790befe122be32a5159e5732fa2615efc5d6daa 100644 (file)
--- a/qcsrc/menu/xonotic/weaponslist.c
+++ b/qcsrc/menu/xonotic/weaponslist.c
@@ -10,7 +10,6 @@ CLASS(XonoticWeaponsList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticWeaponsList, realFontSize, vector, '0 0 0')
        ATTRIB(XonoticWeaponsList, realUpperMargin, float, 0)
        METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector))
-       ATTRIB(XonoticWeaponsList, scrollbarWidth, float, 0)
 ENDCLASS(XonoticWeaponsList)
 entity makeXonoticWeaponsList();
 void WeaponsList_MoveUp_Click(entity btn, entity me);
@@ -25,21 +24,18 @@ entity makeXonoticWeaponsList()
        me.configureXonoticWeaponsList(me);
        return me;
 }
-void configureXonoticWeaponsListXonoticWeaponsList(entity me)
+void XonoticWeaponsList_configureXonoticWeaponsList(entity me)
 {
        me.configureXonoticListBox(me);
 }
-void drawXonoticWeaponsList(entity me)
+void XonoticWeaponsList_draw(entity me)
 {
        // read in cvar?
        string s, t;
        s = W_NumberWeaponOrder(cvar_string("cl_weaponpriority"));
        t = W_FixWeaponOrder(s, 1);
        if(t != s)
-       {
-               print("AUTOFIXED\n");
                cvar_set("cl_weaponpriority", W_NameWeaponOrder(t));
-       }
        me.nItems = tokenize_console(t);
        SUPER(XonoticWeaponsList).draw(me);
 }
@@ -59,7 +55,7 @@ void WeaponsList_MoveDown_Click(entity box, entity me)
                me.selectedItem += 1;
        }
 }
-void resizeNotifyXonoticWeaponsList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticWeaponsList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        SUPER(XonoticWeaponsList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
@@ -67,16 +63,21 @@ void resizeNotifyXonoticWeaponsList(entity me, vector relOrigin, vector relSize,
        me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth));
        me.realUpperMargin = 0.5 * (1 - me.realFontSize_y);
 }
-float mouseDragXonoticWeaponsList(entity me, vector pos)
+float XonoticWeaponsList_mouseDrag(entity me, vector pos)
 {
        float f, i;
        i = me.selectedItem;
        f = SUPER(XonoticWeaponsList).mouseDrag(me, pos);
-       if(me.selectedItem != i)
-               cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem, i));
+       
+       if(me.pressed != 1) // don't change priority if the person is just scrolling
+       {
+               if(me.selectedItem != i)
+                       cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem, i));
+       }
+       
        return f;
 }
-string toStringXonoticWeaponsList(entity me)
+string XonoticWeaponsList_toString(entity me)
 {
        float n, i;
        string s;
@@ -90,16 +91,19 @@ string toStringXonoticWeaponsList(entity me)
        }
        return substring(s, 0, strlen(s) - 2);
 }
-void drawListBoxItemXonoticWeaponsList(entity me, float i, vector absSize, float isSelected)
+void XonoticWeaponsList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
        entity e;
        if(isSelected)
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
        e = get_weaponinfo(stof(argv(i)));
-       draw_Text(me.realUpperMargin * eY, e.message, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
+       string msg = e.message;
+       if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
+               msg = sprintf(_("%s (mutator weapon)"), msg);
+       draw_Text(me.realUpperMargin * eY, msg, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
 }
 
-float keyDownXonoticWeaponsList(entity me, float scan, float ascii, float shift)
+float XonoticWeaponsList_keyDown(entity me, float scan, float ascii, float shift)
 {
        if(ascii == 43) // +
        {