From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 11 Feb 2011 20:20:03 +0000 (+0200)
Subject: Skip melee attack for shotgun while reloading
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~43
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7bb7053f75c6c2778a0a7e026b1849162673ce1;p=xonotic%2Fxonotic-data.pk3dir.git

Skip melee attack for shotgun while reloading
---

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 38e7fef8d..788a578b2 100644
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -131,6 +131,7 @@ float w_shotgun(float req)
 				}
 			}
 		}
+		if (self.clip_load >= 0) // we are not currently reloading
 		if (self.BUTTON_ATCK2 && autocvar_g_balance_shotgun_secondary)
 		if (weapon_prepareattack(1, autocvar_g_balance_shotgun_secondary_refire))
 		{