cvar this behaviour

diff --git a/balance25.cfg b/balance25.cfg
index 482edc1426a19159d5719dd8262a7b859721bf48..63bfe62d8411313fd1cbe62c76c5dc96a6e89cac 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -262,6 +262,7 @@ set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
 set g_balance_shotgun_secondary_melee_range 60
 set g_balance_shotgun_secondary_melee_swing 50
 set g_balance_shotgun_secondary_melee_time 0.1
+set g_balance_shotgun_secondary_melee_no_doubleslap 1
 set g_balance_shotgun_secondary_damage 115
 set g_balance_shotgun_secondary_force 150
 set g_balance_shotgun_secondary_refire 1.1

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 7232f876ce61ee24989c7449ad54f2cb02df6dd4..41e0f66f818583a1744e98e1064af12d4f0e2598 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -262,6 +262,7 @@ set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
 set g_balance_shotgun_secondary_melee_range 85
 set g_balance_shotgun_secondary_melee_swing 50
 set g_balance_shotgun_secondary_melee_time 0.1
+set g_balance_shotgun_secondary_melee_no_doubleslap 1
 set g_balance_shotgun_secondary_damage 84
 set g_balance_shotgun_secondary_force 147
 set g_balance_shotgun_secondary_refire 1.1

diff --git a/balanceSamual.cfg b/balanceSamual.cfg
index 4617606df484005cd43069f38f6bf8a4b83749a9..6a63638d9111f57981c0c9db93584a087006d697 100644 (file)
--- a/balanceSamual.cfg
+++ b/balanceSamual.cfg
@@ -262,6 +262,7 @@ set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
 set g_balance_shotgun_secondary_melee_range 85
 set g_balance_shotgun_secondary_melee_swing 50
 set g_balance_shotgun_secondary_melee_time 0.1
+set g_balance_shotgun_secondary_melee_no_doubleslap 1
 set g_balance_shotgun_secondary_damage 115
 set g_balance_shotgun_secondary_force 150
 set g_balance_shotgun_secondary_refire 1.1

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 55dde194b70e3fbf88d8ff2ea3621570dceb0ddc..bfa62e0344b0e5efed2451e0541e7c24539dd26b 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -262,6 +262,7 @@ set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
 set g_balance_shotgun_secondary_melee_range 85
 set g_balance_shotgun_secondary_melee_swing 50
 set g_balance_shotgun_secondary_melee_time 0.1
+set g_balance_shotgun_secondary_melee_no_doubleslap 0
 set g_balance_shotgun_secondary_damage 110
 set g_balance_shotgun_secondary_force 150
 set g_balance_shotgun_secondary_refire 1.1

diff --git a/balancetZork.cfg b/balancetZork.cfg
index 72f938ba523498858ec55520caa9169f314d6c6d..d966c5b67655f708fce8d299db68d0c7aad7ce7f 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -262,6 +262,7 @@ set g_balance_shotgun_secondary_melee_delay 0.35 // match the anim
 set g_balance_shotgun_secondary_melee_range 85
 set g_balance_shotgun_secondary_melee_swing 50
 set g_balance_shotgun_secondary_melee_time 0.1
+set g_balance_shotgun_secondary_melee_no_doubleslap 1
 set g_balance_shotgun_secondary_damage 110
 set g_balance_shotgun_secondary_force 150
 set g_balance_shotgun_secondary_refire 1.1

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index d5652b775e4620b3831c96b0ae44d16ba1f737b8..2f1978ee0886c4966ebac9713c82b5155868aead 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -641,6 +641,7 @@ float autocvar_g_balance_shotgun_secondary_melee_delay;
 float autocvar_g_balance_shotgun_secondary_melee_range;
 float autocvar_g_balance_shotgun_secondary_melee_swing;
 float autocvar_g_balance_shotgun_secondary_melee_time;
+float autocvar_g_balance_shotgun_secondary_melee_no_doubleslap;
 float autocvar_g_balance_shotgun_secondary_refire;
 float autocvar_g_balance_shotgun_reload_ammo;
 float autocvar_g_balance_shotgun_reload_time;

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index adcb7db4ddfe355c157063504da72ed7f317fdad..01fb5071785df8a5c411a364b47f59f714e9c6c3 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -77,7 +77,7 @@ void shotgun_meleethink (void)
                Damage (trace_ent, self.owner, self.owner, autocvar_g_balance_shotgun_secondary_damage * min(1, f + 1), WEP_SHOTGUN | HITTYPE_SECONDARY , self.owner.origin + self.owner.view_ofs, force);
                remove(self);
        }
-       else if(time >= self.cnt + meleetime || self.owner.deadflag != DEAD_NO) // missed or owner died, remove ent
+       else if(time >= self.cnt + meleetime || self.owner.deadflag != DEAD_NO && autocvar_g_balance_shotgun_secondary_melee_no_doubleslap) // missed or owner died, remove ent
                remove(self);
        else // continue swinging the weapon in hope of hitting someone :)
                self.nextthink = time;