fix weapnext and weapprev

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 4a2abdb..9a1f881 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -916,33 +916,17 @@ alias +zoom +button4
 alias -zoom -button4
 alias +crouch +button5
 alias -crouch -button5
 alias -zoom -button4
 alias +crouch +button5
 alias -crouch -button5

-alias weapnext "_weapnext_${_supports_weaponpriority}${hud_hudselector}${cl_weaponpriority_useforcycling}"
-alias _weapnext_000 "impulse 10"
-alias _weapnext_001 "impulse 10"
-alias _weapnext_010 "impulse 10"
-alias _weapnext_011 "impulse 10"
-alias _weapnext_020 "impulse 10"
-alias _weapnext_021 "impulse 10"
-alias _weapnext_100 "impulse 10"
-alias _weapnext_101 "impulse 15"
-alias _weapnext_110 "impulse 18"
-alias _weapnext_111 "impulse 15"
-alias _weapnext_120 "impulse 18"
-alias _weapnext_121 "impulse 15"
+alias weapnext "_weapnext_${_supports_weaponpriority}${cl_weaponpriority_useforcycling}"
+alias _weapnext_00 "impulse 10"
+alias _weapnext_01 "impulse 10"
+alias _weapnext_10 "impulse 10"
+alias _weapnext_11 "impulse 15"

 alias weaplast "impulse 11"
 alias weaplast "impulse 11"

-alias weapprev "_weapprev_${_supports_weaponpriority}${hud_hudselector}${cl_weaponpriority_useforcycling}"
-alias _weapprev_000 "impulse 12"
-alias _weapprev_001 "impulse 12"
-alias _weapprev_010 "impulse 12"
-alias _weapprev_011 "impulse 12"
-alias _weapprev_020 "impulse 12"
-alias _weapprev_021 "impulse 12"
-alias _weapprev_100 "impulse 12"
-alias _weapprev_101 "impulse 16"
-alias _weapprev_110 "impulse 19"
-alias _weapprev_111 "impulse 16"
-alias _weapprev_120 "impulse 19"
-alias _weapprev_121 "impulse 16"
+alias weapprev "_weapprev_${_supports_weaponpriority}${cl_weaponpriority_useforcycling}"
+alias _weapprev_00 "impulse 12"
+alias _weapprev_01 "impulse 12"
+alias _weapprev_10 "impulse 12"
+alias _weapprev_11 "impulse 16"

 set _supports_weaponpriority 0 "set to 1 by csqc if supported, and to 0 on disconnect"
 alias weapbest "impulse 13"
 
 set _supports_weaponpriority 0 "set to 1 by csqc if supported, and to 0 on disconnect"
 alias weapbest "impulse 13"