Merge branch 'master' into terencehill/clear_button

[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 e64cc72d087f99aaa1315f304eeab312320c3ca8..952c3c956af14273fa62a3ecded70b9935dfeb42 100644 (file)
--- a/qcsrc/menu/xonotic/weaponslist.c
+++ b/qcsrc/menu/xonotic/weaponslist.c
@@ -69,13 +69,7 @@ float XonoticWeaponsList_mouseDrag(entity me, vector pos)
        i = me.selectedItem;
        f = SUPER(XonoticWeaponsList).mouseDrag(me, pos);
        
-       scrollbar = 1;
-       if(pos_x < 1 - me.controlWidth - me.tolerance_y * me.controlWidth) scrollbar = 0;
-       if(pos_y < 0 - me.tolerance_x) scrollbar = 0;
-       if(pos_x >= 1 + me.tolerance_y * me.controlWidth) scrollbar = 0;
-       if(pos_y >= 1 + me.tolerance_x) scrollbar = 0;
-       
-       if not(scrollbar) // don't change priority if the person is just scrolling
+       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));