Merge branch 'master' into Mario/entcs

[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 1f2a4e19e65b2fb2caeecab9da8c2b13e6576df7..7b3d7375b7760018cf4ab267e3f8d2daab6bc137 100644 (file)
--- a/qcsrc/menu/xonotic/weaponslist.qc
+++ b/qcsrc/menu/xonotic/weaponslist.qc
@@ -1,24 +1,9 @@
-#ifndef WEAPONSLIST_H
-#define WEAPONSLIST_H
-#include "listbox.qc"
-CLASS(XonoticWeaponsList, XonoticListBox)
-       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));
-       ATTRIB(XonoticWeaponsList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticWeaponsList, realUpperMargin, float, 0)
-       METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector));
-ENDCLASS(XonoticWeaponsList)
-entity makeXonoticWeaponsList();
-void WeaponsList_MoveUp_Click(entity btn, entity me);
-void WeaponsList_MoveDown_Click(entity box, entity me);
-#endif
+#include "weaponslist.qh"
+
+#include <common/weapons/_all.qh>
+
+.bool disabled;
 
-#ifdef IMPLEMENTATION
 entity makeXonoticWeaponsList()
 {
        entity me;
@@ -73,7 +58,11 @@ float XonoticWeaponsList_mouseDrag(entity me, vector pos)
        if(me.pressed != 1) // don't change priority if the person is just scrolling
        {
                if(me.selectedItem != i)
+               {
+                       if(me.applyButton)
+                               me.applyButton.disabled = false;
                        cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem, i));
+               }
        }
 
        return f;
@@ -87,8 +76,8 @@ string XonoticWeaponsList_toString(entity me)
        s = "";
        for(i = 0; i < n; ++i)
        {
-               e = get_weaponinfo(stof(argv(i)));
-               s = strcat(s, e.message, ", ");
+               e = Weapons_from(stof(argv(i)));
+               s = strcat(s, e.m_name, ", ");
        }
        return substring(s, 0, strlen(s) - 2);
 }
@@ -102,8 +91,8 @@ void XonoticWeaponsList_drawListBoxItem(entity me, int i, vector absSize, bool i
                me.focusedItemAlpha = getFadedAlpha(me.focusedItemAlpha, SKINALPHA_LISTBOX_FOCUSED, SKINFADEALPHA_LISTBOX_FOCUSED);
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, me.focusedItemAlpha);
        }
-       e = get_weaponinfo(stof(argv(i)));
-       string msg = e.message;
+       e = Weapons_from(stof(argv(i)));
+       string msg = e.m_name;
        if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
                msg = strcat(msg, "*");
 
@@ -132,4 +121,3 @@ float XonoticWeaponsList_keyDown(entity me, float scan, float ascii, float shift
                return 1;
        return 0;
 }
-#endif