From: Mario <mario@smbclan.net>
Date: Mon, 18 Jun 2018 08:42:03 +0000 (+1000)
Subject: Revert "Leave the load in the weapon when throwing it"
X-Git-Tag: xonotic-v0.8.5~2015
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b6cfffd1aa9d7c695ea2791342208b3660ef46c9;p=xonotic%2Fxonotic-data.pk3dir.git

Revert "Leave the load in the weapon when throwing it"

This reverts commit b3b87165949a2d97634b425231aeb56324cc1ce7.
---

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index 35837af90..462af14d8 100644
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -101,7 +101,6 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 
 		if(doreduce && g_weapon_stay == 2)
 		{
-		#if 0
 			// if our weapon is loaded, give its load back to the player
 			int i = own.(weaponentity).m_weapon.m_id;
 			if(own.(weaponentity).(weapon_load[i]) > 0)
@@ -109,12 +108,10 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 				GiveResource(own, ammotype, own.(weaponentity).(weapon_load[i]));
 				own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading
 			}
-		#endif
 			SetResourceAmount(wep, ammotype, 0);
 		}
 		else if(doreduce)
 		{
-		#if 0
 			// if our weapon is loaded, give its load back to the player
 			int i = own.(weaponentity).m_weapon.m_id;
 			if(own.(weaponentity).(weapon_load[i]) > 0)
@@ -122,7 +119,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 				GiveResource(own, ammotype, own.(weaponentity).(weapon_load[i]));
 				own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading
 			}
-		#endif
+
 			float ownderammo = GetResourceAmount(own, ammotype);
 			thisammo = min(ownderammo, GetResourceAmount(wep, ammotype));
 			SetResourceAmount(wep, ammotype, thisammo);