weaponpriority vs HUD fixes (a lot of them)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_weapons.qc

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 04b656c9a134e0daf0ee956dff64e7dd5251b753..4ab7abde4b200cf0bf122f2ef955408018ddc4d4 100644 (file)
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -121,9 +121,9 @@ void W_NextWeaponOnImpulse(float imp)
 void W_NextWeapon(float list)
 {
        if(list == 0)
-               W_CycleWeapon(weaponpriority_hudselector_0, -1);
+               W_CycleWeapon(weaponorder_byid, -1);
        else if(list == 1)
-               W_CycleWeapon(weaponpriority_hudselector_1, -1);
+               W_CycleWeapon(weaponorder_byimpulse, -1);
        else if(list == 2)
                W_CycleWeapon(self.cvar_cl_weaponpriority, -1);
 }
@@ -132,9 +132,9 @@ void W_NextWeapon(float list)
 void W_PreviousWeapon(float list)
 {
        if(list == 0)
-               W_CycleWeapon(weaponpriority_hudselector_0, +1);
+               W_CycleWeapon(weaponorder_byid, +1);
        else if(list == 1)
-               W_CycleWeapon(weaponpriority_hudselector_1, +1);
+               W_CycleWeapon(weaponorder_byimpulse, +1);
        else if(list == 2)
                W_CycleWeapon(self.cvar_cl_weaponpriority, +1);
 }