From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 30 Jun 2010 15:25:00 +0000 (+0300)
Subject: Part of the script, not yet ready nor working
X-Git-Tag: xonotic-v0.1.0preview~512
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=76d5cc9849de81a6b53b8c157be945b5e031526f;p=xonotic%2Fxonotic-data.pk3dir.git

Part of the script, not yet ready nor working
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 71d2114d4..162075833 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -954,8 +954,8 @@ bind 8 "impulse 8"
 bind 9 "impulse 9"
 bind 0 "impulse 14" // cycles the superweapons
 bind q weaplast
-bind MOUSE1 +attack
-bind MOUSE2 +attack2
+bind MOUSE1 +preattack
+bind MOUSE2 +preattack2
 bind MOUSE3 +zoom
 bind MOUSE4 weaplast
 bind MOUSE5 +hook
@@ -989,8 +989,8 @@ bind JOY1 "+crouch"
 bind JOY2 "+jump"
 bind JOY3 "weapprev"
 bind JOY4 "weapnext"
-bind JOY5 "+attack2"
-bind JOY6 "+attack"
+bind JOY5 "+preattack2"
+bind JOY6 "+preattack"
 bind JOY7 "+zoom"
 bind JOY8 "dropweapon"
 bind JOY9 "menu_showteamselect"
@@ -1530,6 +1530,12 @@ alias _gl_flashblend_update_01 "gl_flashblend 0"
 alias _gl_flashblend_update_11 "gl_flashblend 0"
 alias gl_flashblend_update "_gl_flashblend_update_$r_shadow_realtime_dlight$r_showsurfaces"
 
+alias decidion_0 "echo It's 0!"
+alias decidion_1 "echo It's 1!"
+alias firing_swap "cl_reversefirebuttons_$1; decision_$2;"
+alias cl_hook_activeweapon "firing_swap $1"
+//alias +preattack "cl_hook_weapon; cl_fireswapping_$1"
+
 set sv_clones 0	"number of clones a player may make (reset by the \"kill\" command)"
 
 set cl_handicap 1	"the higher, the more damage you will receive (client setting)"
@@ -1708,7 +1714,7 @@ alias cl_hook_gamestart_rc
 alias cl_hook_gamestart_nexball
 alias cl_hook_gamestart_cts
 alias cl_hook_gameend
-alias cl_hook_activeweapon
+//alias cl_hook_activeweapon
 
 alias _sv_hook_gamestart "set _sv_hook_gametype $1; _sv_hook_gamestart_stage2"
 alias _sv_hook_gamestart_stage2 "sv_hook_gamestart_all; sv_hook_gamestart_${_sv_hook_gametype}"
diff --git a/keybinds.txt b/keybinds.txt
index 1aee5d818..eb4c12f54 100644
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -8,8 +8,8 @@
 "+hook"                                 "off-hand hook / jet pack"
 ""                                      ""
 ""                                      "Attacking"
-"+attack"                               "primary fire"
-"+attack2"                              "secondary fire"
+"+preattack"                               "primary fire"
+"+preattack2"                              "secondary fire"
 ""                                      ""
 ""                                      "Weapon switching"
 "weapprev"                              "previous"