From 5f4e499925b58b965fe0ea9bc649bbee9a49d5e6 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Thu, 1 Jul 2010 15:12:04 +0300 Subject: [PATCH] More cosmetic changes to the script --- defaultXonotic.cfg | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 82795ba612..fd6f2da345 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1532,19 +1532,19 @@ alias gl_flashblend_update "_gl_flashblend_update_$r_shadow_realtime_dlight$r_sh // this script allows swapping the primary and secondary fire buttons for any weapon, using the cl_swapattacks_* cvars. // This part of the code is necessary to keep us firing when we switch weapons while holding a fire button pressed. -// Also updates the effect immediately, so you don't have to switch to another weapon and back for changes to take place +// 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 "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" -alias firing_switch_atck2_1 "+preattack2" -alias firing_switch "-preattack; -preattack2; firing_switch_atck_$preattack_last; firing_switch_atck2_$preattack2_last;" -// now apply the changes to the key binds +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 firing_switch_attack_0 "" +alias firing_switch_attack2_0 "" +alias firing_switch_attack_1 "+preattack" +alias firing_switch_attack2_1 "+preattack2" +alias firing_switch "-preattack; -preattack2; firing_switch_attack_$preattack_last; firing_switch_attack2_$preattack2_last;" +// 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}" -- 2.39.2