From: Samual Lenks <samual@xonotic.org>
Date: Wed, 11 Dec 2013 00:06:20 +0000 (-0500)
Subject: Blaster is no longer reloadable
X-Git-Tag: xonotic-v0.8.0~152^2~241
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=bd0f8ad3384993fdb366309e037a7f10ef13f160;p=xonotic%2Fxonotic-data.pk3dir.git

Blaster is no longer reloadable
---

diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc
index 96bc865bc..7d6f964a9 100644
--- a/qcsrc/common/weapons/w_blaster.qc
+++ b/qcsrc/common/weapons/w_blaster.qc
@@ -4,7 +4,7 @@ REGISTER_WEAPON(
 /* function */ W_Blaster,
 /* ammotype */ ammo_none,
 /* impulse  */ 1,
-/* flags    */ WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
+/* flags    */ WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH,
 /* rating   */ 0,
 /* model    */ "laser",
 /* netname  */ "laser",
@@ -25,8 +25,6 @@ REGISTER_WEAPON(
 	w_cvar(id, sn, MO_BOTH, speed) \
 	w_cvar(id, sn, MO_BOTH, spread) \
 	w_cvar(id, sn, MO_NONE, secondary) \
-	w_prop(id, sn, float,  reloading_ammo, reload_ammo) \
-	w_prop(id, sn, float,  reloading_time, reload_time) \
 	w_prop(id, sn, float,  switchdelay_raise, switchdelay_raise) \
 	w_prop(id, sn, float,  switchdelay_drop, switchdelay_drop) \
 	w_prop(id, sn, string, weaponreplace, weaponreplace) \
@@ -163,11 +161,7 @@ float W_Blaster(float request)
 		
 		case WR_THINK:
 		{
-			if(WEP_CVAR(blaster, reload_ammo) && self.clip_load < 1) // forced reload
-			{
-				WEP_ACTION(self.weapon, WR_RELOAD);
-			}
-			else if(self.BUTTON_ATCK)
+			if(self.BUTTON_ATCK)
 			{
 				if(weapon_prepareattack(0, WEP_CVAR_PRI(blaster, refire)))
 				{
@@ -251,12 +245,6 @@ float W_Blaster(float request)
 			return TRUE;
 		}
 		
-		case WR_RELOAD:
-		{
-			W_Reload(0, "weapons/reload.wav");
-			return TRUE;
-		}
-		
 		case WR_SUICIDEMESSAGE:
 		{
 			return WEAPON_LASER_SUICIDE;