Make the button swap update when refiring the weapon too, so we won't have to switch...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 6dedf5bf2416ece08eaf8e22247311c8da64826c..0b1ed557b26e2ae0f792c787ac2a0f7cc5ed2e02 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1534,10 +1534,10 @@ alias gl_flashblend_update "_gl_flashblend_update_$r_shadow_realtime_dlight$r_sh
 
 set preattack_last 0
 set preattack2_last 0
-alias +preattack "set preattack_last 1; +checkattack"
-alias -preattack "set preattack_last 0; -checkattack"
-alias +preattack2 "set preattack2_last 1; +checkattack2"
-alias -preattack2 "set preattack2_last 0; -checkattack2"
+alias +preattack "set preattack_last 1; firing_swap2 $firing_lastweapon; +checkattack"
+alias -preattack "set preattack_last 0; firing_swap2 $firing_lastweapon; -checkattack"
+alias +preattack2 "set preattack2_last 1; firing_swap2 $firing_lastweapon; +checkattack2"
+alias -preattack2 "set preattack2_last 0; firing_swap2 $firing_lastweapon; -checkattack2"
 alias firing_switch_atck_0 ""
 alias firing_switch_atck2_0 ""
 alias firing_switch_atck_1 "+preattack"
@@ -1547,7 +1547,7 @@ alias firing_switch "-preattack; -preattack2; firing_switch_atck_$preattack_last
 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; firing_switch"
+alias firing_swap "firing_swap2 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"