From e504381e106ef4601f30d48fa40d4b15362568aa Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Thu, 1 Jul 2010 03:26:25 +0300 Subject: [PATCH] Make the button swap update when refiring the weapon too, so we won't have to switch to another weapon and back to see the change. This fixes all known issues with the script :) --- defaultXonotic.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 6dedf5bf2..0b1ed557b 100644 --- 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" -- 2.39.2