Merge remote-tracking branch 'origin/fruitiex/fix_slap'

diff --git a/balance25.cfg b/balance25.cfg
index bcc374cd289c118e510219cb2c2eee484773f3ca..bf8d40cf6e2826d943cf4c2a9b91c3838c62fed5 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 4de61dca0fb87afaddce978c393162d66722f142..820456e8a313c8a8fadb1969885b20114257f30e 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 5da6f7778dec903b4d5af451f8455ab5ac15bd1a..e661da4775f001bb5f32ef18d421d960ae449acb 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 e3e586232103c2e98059f3fd819ea13a9fd2ff49..4f78941da24444189d84af80bf605b22b588cea5 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 8886d5424d397d21936acbc2cd55b6ea5bee323a..69aa7d1b534d16ea3882c442e9bd841e121310ac 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 2a99f50323fe01ea43ae1b837d6a56956ecbf4dc..4d8083fe779f7a1865af178f492fcf110aaf0bcc 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -646,6 +646,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 38ae17a24f579e6ef4ea2d05a849f4a812e3dd1f..635b1ccf8b959ac753e4f06ef493605e9049b973 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) // missed, 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;