From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 28 Feb 2011 14:50:40 +0000 (+0200)
Subject: Fix remaining parts of server side code. Reloading will work properly now
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=53a211979edd92b2d6dc10a121fdc1d908844fea

Fix remaining parts of server side code. Reloading will work properly now
---

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 09a945f5..126f4249 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -74,7 +74,9 @@ float w_grabber(float req)
 	}
 	else if (req == WR_THINK)
 	{
-		if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))
+		if(cvar("g_balance_grabber_reload_ammo") && self.clip_load < min(cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_secondary_ammo"))) // forced reload
+			weapon_action(self.weapon, WR_RELOAD);
+		else if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))
 		{
 			if(time < self.weapon_delay)
 				return FALSE;
@@ -90,8 +92,7 @@ float w_grabber(float req)
 				weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready);				
 			}
 		}
-
-		if (self.BUTTON_ATCK2)
+		else if (self.BUTTON_ATCK2)
 		{
 			if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire")))
 			{
@@ -213,7 +214,7 @@ float w_grabber(float req)
 	}
 	else if (req == WR_RELOAD)
 	{
-		W_Reload(min(cvar("g_balance_hagar_primary_ammo"), cvar("g_balance_hagar_secondary_ammo")), cvar("g_balance_hagar_reload_ammo"), cvar("g_balance_hagar_reload_time"), "weapons/reload.wav");
+		W_Reload(min(cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_secondary_ammo")), cvar("g_balance_grabber_reload_ammo"), cvar("g_balance_grabber_reload_time"), "weapons/reload.wav");
 	}
 	else if (req == WR_SUICIDEMESSAGE)
 		w_deathtypestring = "did the impossible";