Don't check for changes when un-firing, since that's completely useless and unneeded...

[xonotic/xonotic-data.pk3dir.git] / defaultXonotic.cfg

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index fd6f2da3453dabaadc1146972ad18c1748d50433..f87fbaa3e14069223c03c53a53b863afd9300cc2 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1535,10 +1535,10 @@ alias gl_flashblend_update "_gl_flashblend_update_$r_shadow_realtime_dlight$r_sh
 // Also updates the keys before firing, so we don't have to switch to another weapon and back to apply the changes
 set preattack_last 0
 set preattack2_last 0
-alias +preattack "firing_swap2 $firing_lastweapon; set preattack_last 1; +checkattack"
-alias -preattack "firing_swap2 $firing_lastweapon; set preattack_last 0; -checkattack"
-alias +preattack2 "firing_swap2 $firing_lastweapon; set preattack2_last 1; +checkattack2"
-alias -preattack2 "firing_swap2 $firing_lastweapon; set preattack2_last 0; -checkattack2"
+alias +preattack "firing_swap_apply $firing_lastweapon; set preattack_last 1; +checkattack"
+alias -preattack "set preattack_last 0; -checkattack"
+alias +preattack2 "firing_swap_apply $firing_lastweapon; set preattack2_last 1; +checkattack2"
+alias -preattack2 "set preattack2_last 0; -checkattack2"
 alias firing_switch_attack_0 ""
 alias firing_switch_attack2_0 ""
 alias firing_switch_attack_1 "+preattack"
@@ -1547,8 +1547,8 @@ alias firing_switch "-preattack; -preattack2; firing_switch_attack_$preattack_la
 // now apply changes to the key binds and get the weapon we are using
 alias firing_decision_0 "alias +checkattack +attack; alias -checkattack -attack; alias +checkattack2 +attack2; alias -checkattack2 -attack2"
 alias firing_decision_1 "alias +checkattack +attack2; alias -checkattack -attack2; alias +checkattack2 +attack; alias -checkattack2 -attack"
-alias firing_swap2 "firing_decision_${$1}"
-alias firing_swap "firing_swap2 cl_swapattacks_$1; set firing_lastweapon cl_swapattacks_$1; firing_switch"
+alias firing_swap_apply "firing_decision_${$1}"
+alias firing_swap "firing_swap_apply cl_swapattacks_$1; set firing_lastweapon cl_swapattacks_$1; firing_switch"
 
 // this hook activates when we switch weapons, and allows us to script weapon specific properties (like the fire button swapping script)
 alias cl_hook_activeweapon "firing_swap $1"