X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fweapons%2Fthrowing.qc;h=7e8a061f049b1ebc552308c796219c1b716eedbd;hb=be37ea91fb3bbd1a6fa4f0b70b32d1ea95343ad4;hp=dcf9ee41b33f2805c2364b4c909bda592ff4feb7;hpb=76de60deecae125795551ba1a4576a265d7ae7de;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index dcf9ee41b..7e8a061f0 100644
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -3,7 +3,7 @@
 #include "weaponsystem.qh"
 #include "../resources.qh"
 #include "../items.qh"
-#include "../mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 #include <common/t_items.qh>
 #include "../g_damage.qh"
 #include <common/items/item.qh>
@@ -33,11 +33,9 @@ void thrown_wep_think(entity this)
 		SUB_VanishOrRemove(this);
 }
 
-// returns amount of ammo used as string, or -1 for failure, or 0 for no ammo count
-string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector velo, .entity weaponentity)
+// returns amount of ammo used, or -1 for failure, or 0 for no ammo count
+float W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector velo, .entity weaponentity)
 {
-	float thisammo;
-	string s;
 	Weapon info = Weapons_from(wpn);
 	int ammotype = info.ammo_type;
 
@@ -84,21 +82,19 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 
 	weapon_defaultspawnfunc(wep, info);
 	if(startitem_failed)
-		return string_null;
+		return -1;
 	setthink(wep, thrown_wep_think);
 	wep.savenextthink = wep.nextthink;
 	wep.nextthink = min(wep.nextthink, time + 0.5);
 	wep.pickup_anyway = true; // these are ALWAYS pickable
 
 	//wa = W_AmmoItemCode(wpn);
-	if(ammotype == RESOURCE_NONE)
+	if(ammotype == RES_NONE)
 	{
-		return "";
+		return 0;
 	}
 	else
 	{
-		s = "";
-
 		if(doreduce && g_weapon_stay == 2)
 		{
 			// if our weapon is loaded, give its load back to the player
@@ -108,7 +104,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
 			}
-			SetResourceAmount(wep, ammotype, 0);
+			SetResource(wep, ammotype, 0);
 		}
 		else if(doreduce)
 		{
@@ -120,24 +116,14 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 				own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading
 			}
 
-			float ownderammo = GetResourceAmount(own, ammotype);
-			thisammo = min(ownderammo, GetResourceAmount(wep, ammotype));
-			SetResourceAmount(wep, ammotype, thisammo);
-			SetResourceAmount(own, ammotype, ownderammo - thisammo);
-
-			switch (ammotype)
-			{
-				case RESOURCE_SHELLS:  s = sprintf("%s and %d shells", s, thisammo);  break;
-				case RESOURCE_BULLETS: s = sprintf("%s and %d nails", s, thisammo);   break;
-				case RESOURCE_ROCKETS: s = sprintf("%s and %d rockets", s, thisammo); break;
-				case RESOURCE_CELLS:   s = sprintf("%s and %d cells", s, thisammo);   break;
-				case RESOURCE_PLASMA:  s = sprintf("%s and %d plasma", s, thisammo);  break;
-				case RESOURCE_FUEL:    s = sprintf("%s and %d fuel", s, thisammo);    break;
-			}
+			float ownderammo = GetResource(own, ammotype);
+			float thisammo = min(ownderammo, GetResource(wep, ammotype));
+			SetResource(wep, ammotype, thisammo);
+			SetResource(own, ammotype, ownderammo - thisammo);
 
-			s = substring(s, 5, -1);
+			return thisammo;
 		}
-		return s;
+		return 0;
 	}
 }
 
@@ -148,9 +134,9 @@ bool W_IsWeaponThrowable(entity this, int w)
 	if (!autocvar_g_pickup_items)
 		return false;
 	if (g_weaponarena)
-		return 0;
-    if(w == WEP_Null.m_id)
-        return false;
+		return false;
+	if (w == WEP_Null.m_id)
+		return false;
 
 	return (Weapons_from(w)).weaponthrowable;
 }
@@ -175,10 +161,10 @@ void W_ThrowWeapon(entity this, .entity weaponentity, vector velo, vector delta,
 	STAT(WEAPONS, this) &= ~set;
 
 	W_SwitchWeapon_Force(this, w_getbestweapon(this, weaponentity), weaponentity);
-	string a = W_ThrowNewWeapon(this, w.m_id, doreduce, this.origin + delta, velo, weaponentity);
+	float a = W_ThrowNewWeapon(this, w.m_id, doreduce, this.origin + delta, velo, weaponentity);
 
-	if(!a) return;
-	Send_Notification(NOTIF_ONE, this, MSG_MULTI, ITEM_WEAPON_DROP, a, w.m_id);
+	if(a < 0) return;
+	Send_Notification(NOTIF_ONE, this, MSG_MULTI, ITEM_WEAPON_DROP, w.m_id, a);
 }
 
 void SpawnThrownWeapon(entity this, vector org, Weapon wep, .entity weaponentity)