From: mand1nga <mand1nga@xonotic.org>
Date: Sat, 4 Dec 2010 17:17:15 +0000 (-0300)
Subject: Added support for shotgun melee
X-Git-Tag: xonotic-v0.1.0preview~65^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4f9f1d2f5ee42e8ba7867c407b3dc6ee7109265b;p=xonotic%2Fxonotic-data.pk3dir.git

Added support for shotgun melee
---

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index d9bb056ee..08c4a901e 100644
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -100,10 +100,10 @@ void spawnfunc_weapon_shotgun(); // defined in t_items.qc
 float w_shotgun(float req)
 {
 	if (req == WR_AIM)
-		if(vlen(self.origin-self.enemy.origin)>200)
-			self.BUTTON_ATCK = bot_aim(1000000, 0, 0.001, FALSE);
-		else
+		if(vlen(self.origin-self.enemy.origin) <= autocvar_g_balance_shotgun_secondary_melee_range)
 			self.BUTTON_ATCK2 = bot_aim(1000000, 0, 0.001, FALSE);
+		else
+			self.BUTTON_ATCK = bot_aim(1000000, 0, 0.001, FALSE);
 	else if (req == WR_THINK)
 	{
 		if (self.BUTTON_ATCK)