Merge branch 'sev/lumaIcons' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / weapons.qc

diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc
index f94979133c588c634d576f8e8b1b1fb545fa9337..8bf11cf1ac93d3994840bb64b96bac5ce993317d 100644 (file)
--- a/qcsrc/client/hud/panel/weapons.qc
+++ b/qcsrc/client/hud/panel/weapons.qc
@@ -11,7 +11,7 @@
 entity weaponorder[Weapons_MAX];
 void weaponorder_swap(int i, int j, entity pass)
 {
-    TC(int, i); TC(int, j);
+       TC(int, i); TC(int, j);
        entity h = weaponorder[i];
        weaponorder[i] = weaponorder[j];
        weaponorder[j] = h;
@@ -20,7 +20,7 @@ void weaponorder_swap(int i, int j, entity pass)
 string weaponorder_cmp_str;
 int weaponorder_cmp(int i, int j, entity pass)
 {
-    TC(int, i); TC(int, j);
+       TC(int, i); TC(int, j);
        int ai = strstrofs(weaponorder_cmp_str, sprintf(" %d ", weaponorder[i].m_id), 0);
        int aj = strstrofs(weaponorder_cmp_str, sprintf(" %d ", weaponorder[j].m_id), 0);
        return aj - ai; // the string is in REVERSE order (higher prio at the right is what we want, but higher prio first is the string)
@@ -108,7 +108,7 @@ void HUD_Weapons()
        }
 
        if(!autocvar_hud_panel_weapons_complainbubble || autocvar__hud_configure || time - complain_weapon_time >= when + fadetime)
-               complain_weapon = 0;
+               complain_weapon = NULL;
 
        entity wepent = viewmodels[0]; // TODO: unhardcode
 
@@ -169,13 +169,13 @@ void HUD_Weapons()
                if (autocvar_hud_panel_weapons_onlyowned >= 2) // only current
                {
                        for (i = 0; i <= WEP_LAST-WEP_FIRST; ++i)
-                               if (weaponorder[i] == panel_switchweapon || weaponorder[i].m_id == complain_weapon)
+                               if (weaponorder[i] == panel_switchweapon || weaponorder[i] == complain_weapon)
                                        ++weapon_count;
                }
                else
                {
                        for (i = 0; i <= WEP_LAST-WEP_FIRST; ++i)
-                               if ((weapons_stat & WepSet_FromWeapon(weaponorder[i])) || weaponorder[i].m_id == complain_weapon)
+                               if ((weapons_stat & WepSet_FromWeapon(weaponorder[i])) || weaponorder[i] == complain_weapon)
                                        ++weapon_count;
                }
 
@@ -407,12 +407,12 @@ void HUD_Weapons()
                {
                        if (autocvar_hud_panel_weapons_onlyowned >= 2) // only current
                        {
-                               if (!(it == panel_switchweapon || it.m_id == complain_weapon))
+                               if (!(it == panel_switchweapon || it == complain_weapon))
                                        continue;
                        }
                        else
                        {
-                               if (!((weapons_stat & WepSet_FromWeapon(it)) || (it.m_id == complain_weapon)))
+                               if (!((weapons_stat & WepSet_FromWeapon(it)) || (it == complain_weapon)))
                                        continue;
                        }
                }
@@ -534,7 +534,7 @@ void HUD_Weapons()
                }
 
                // draw the complain message
-               if(it.m_id == complain_weapon)
+               if(it == complain_weapon)
                {
                        if(fadetime)
                                a = ((complain_weapon_time + when > time) ? 1 : bound(0, (complain_weapon_time + when + fadetime - time) / fadetime, 1));