From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 23 Jan 2011 16:00:04 +0000 (+0200)
Subject: Fix duplicate WR_RESETPLAYER in Sniper code
X-Git-Tag: xonotic-v0.5.0~309^2~7^2~86
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a2e290a9092f704dffaef8b50fc4be0dca8bb35;p=xonotic%2Fxonotic-data.pk3dir.git

Fix duplicate WR_RESETPLAYER in Sniper code
---

diff --git a/qcsrc/server/w_sniperrifle.qc b/qcsrc/server/w_sniperrifle.qc
index c19c74427..3320ae792 100644
--- a/qcsrc/server/w_sniperrifle.qc
+++ b/qcsrc/server/w_sniperrifle.qc
@@ -261,6 +261,8 @@ float w_sniperrifle(float req)
 	}
 	else if (req == WR_RESETPLAYER)
 	{
+		self.sniperrifle_accumulator = time - autocvar_g_balance_sniperrifle_bursttime;
+
 		// all weapons must be fully loaded when we spawn
 		self.sniperrifle_load = autocvar_g_balance_sniperrifle_reload_ammo;
 	}
@@ -268,11 +270,6 @@ float w_sniperrifle(float req)
 	{
 		W_SniperRifle_Reload();
 	}
-	else if (req == WR_RESETPLAYER)
-	{
-		self.sniperrifle_accumulator = time - autocvar_g_balance_sniperrifle_bursttime;
-		self.clip_load = autocvar_g_balance_sniperrifle_reload_ammo;
-	}
 	return TRUE;
 };
 #endif