From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 11 Apr 2011 22:16:28 +0000 (+0300)
Subject: If no loading speed is set, fill in all the rockets at once. Might be a better and... 
X-Git-Tag: xonotic-v0.5.0~263^2~10^2~44
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc79763325f92e7688f6e61d24b42d35eb08d989;p=xonotic%2Fxonotic-data.pk3dir.git

If no loading speed is set, fill in all the rockets at once. Might be a better and safer behavior.
---

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index 8e676e20c..2aeba812d 100644
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -141,13 +141,20 @@ void W_Hagar_Attack2_Load (void)
 		// we can attempt to load another rocket
 		if(self.hagar_loadtime < time)
 		{
-			self.hagar_load += 1;
-			sound(self, CHAN_WEAPON2, "weapons/hagar_load.wav", VOL_BASE, ATTN_NORM);
+			// if there's no loading speed, fill in the rockets
+			if(autocvar_g_balance_hagar_secondary_load_speed)
+			{
+				self.hagar_load += 1;
+				sound(self, CHAN_WEAPON2, "weapons/hagar_load.wav", VOL_BASE, ATTN_NORM);
+			}
+			else
+				self.hagar_load = autocvar_g_balance_hagar_secondary_load_max;
 
 			self.hagar_loadtime = time + autocvar_g_balance_hagar_secondary_load_speed;
 		}
 	}
-	else if(self.hagar_load && (!self.BUTTON_ATCK2 || ((loaded || !enough_ammo) && !autocvar_g_balance_hagar_secondary_load_hold)))
+
+	if(self.hagar_load && (!self.BUTTON_ATCK2 || ((loaded || !enough_ammo) && !autocvar_g_balance_hagar_secondary_load_hold)))
 	if(weapon_prepareattack(0, autocvar_g_balance_hagar_secondary_refire))
 	{
 		// time to release the rockets we've loaded