Actually fix entering vehicles in independent players mode

[xonotic/xonotic-data.pk3dir.git] / hook-firing_swap.cfg

diff --git a/hook-firing_swap.cfg b/hook-firing_swap.cfg
index a24a98c93330dc85b675e4c59a581e3038008083..919d2ead2c70caaaf702f06314fe44b66732dd0c 100644 (file)
--- a/hook-firing_swap.cfg
+++ b/hook-firing_swap.cfg
@@ -9,25 +9,33 @@
 // after exec'ing them all from your autoexec.cfg
 
 // Set the cvars for each gun
 // after exec'ing them all from your autoexec.cfg
 
 // Set the cvars for each gun

-seta cl_swapattacks_laser 0
+seta cl_swapattacks_blaster 0

 seta cl_swapattacks_shotgun 0
 seta cl_swapattacks_shotgun 0

-seta cl_swapattacks_uzi 0
-seta cl_swapattacks_grenadelauncher 0
+seta cl_swapattacks_machinegun 0
+seta cl_swapattacks_mortar 0

 seta cl_swapattacks_minelayer 0
 seta cl_swapattacks_electro 0
 seta cl_swapattacks_crylink 0
 seta cl_swapattacks_minelayer 0
 seta cl_swapattacks_electro 0
 seta cl_swapattacks_crylink 0

-seta cl_swapattacks_nex 0
+seta cl_swapattacks_vortex 0

 seta cl_swapattacks_hagar 0
 seta cl_swapattacks_hagar 0

-seta cl_swapattacks_rocketlauncher 0
+seta cl_swapattacks_devastator 0

 seta cl_swapattacks_porto 0
 seta cl_swapattacks_porto 0

-seta cl_swapattacks_minstanex 0
+seta cl_swapattacks_vaporizer 0

 seta cl_swapattacks_hook 0
 seta cl_swapattacks_hlac 0
 seta cl_swapattacks_tuba 0
 seta cl_swapattacks_hook 0
 seta cl_swapattacks_hlac 0
 seta cl_swapattacks_tuba 0

-seta cl_swapattacks_sniperrifle 0
+seta cl_swapattacks_rifle 0

 seta cl_swapattacks_fireball 0
 seta cl_swapattacks_seeker 0
 
 seta cl_swapattacks_fireball 0
 seta cl_swapattacks_seeker 0
 

+// Backwards compatibility with 0.7.0
+alias cl_swapattacks_laser $cl_swapattacks_blaster
+alias cl_swapattacks_rocketlauncher $cl_swapattacks_devastator
+alias cl_swapattacks_uzi $cl_swapattacks_machinegun
+alias cl_swapattacks_grenadelauncher $cl_swapattacks_mortar
+alias cl_swapattacks_minstanex $cl_swapattacks_vaporizer
+alias cl_swapattacks_nex $cl_swapattacks_vortex
+

 // This part of the code is necessary to keep us firing when we switch weapons while holding a fire button pressed
 // Also updates the keys before firing, so we don't have to switch to another weapon and back to apply the changes
 set fire_last 0
 // This part of the code is necessary to keep us firing when we switch weapons while holding a fire button pressed
 // Also updates the keys before firing, so we don't have to switch to another weapon and back to apply the changes
 set fire_last 0


@@ -48,7 +56,7 @@ alias firing_decision_1 "alias +checkattack +attack2; alias -checkattack -attack
 alias firing_swap_apply "firing_decision_${$1}"
 alias firing_swap "firing_swap_apply 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"
 

-// Not correct, but prevents firing from braking after executing the script until switching weapons
+// Not correct, but prevents firing from breaking after executing the script until switching weapons

 alias +fire +attack
 alias -fire -attack
 alias +fire2 +attack2
 alias +fire +attack
 alias -fire -attack
 alias +fire2 +attack2