X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fthrowing.qc;h=ae745efd6fdaa90f6ed39b9d8b59e4736a3c26fa;hb=531fa1eb217365d964f726f2c818db8db9cd9a7f;hp=ba84b14c50d11ea9ebb657e8b5465c25e5d210b2;hpb=36ba1021949ebd475e0561237a17ecf9fb93ced8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index ba84b14c5..ae745efd6 100644
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -1,6 +1,8 @@
 #include "throwing.qh"
 
 #include "weaponsystem.qh"
+#include "../resources.qh"
+#include "../items.qh"
 #include "../mutators/_mod.qh"
 #include <common/t_items.qh>
 #include "../g_damage.qh"
@@ -20,10 +22,7 @@ void thrown_wep_think(entity this)
 	{
 		this.SendFlags |= ISF_LOCATION;
 		this.oldorigin = this.origin;
-		this.bot_pickup = false;
 	}
-	else
-		this.bot_pickup = true;
 	this.owner = NULL;
 	float timeleft = this.savenextthink - time;
 	if(timeleft > 1)
@@ -40,21 +39,23 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 	float thisammo;
 	string s;
 	Weapon info = Weapons_from(wpn);
-	var .int ammotype = info.ammo_field;
-
-	entity wep = new(droppedweapon);
+	int ammotype = info.ammo_type;
 
+	entity wep = spawn();
+	Item_SetLoot(wep, true);
 	setorigin(wep, org);
 	wep.velocity = velo;
 	wep.owner = wep.enemy = own;
 	wep.flags |= FL_TOSSED;
 	wep.colormap = own.colormap;
 	wep.glowmod = weaponentity_glowmod(info, own, own.clientcolors, own.(weaponentity));
+	navigation_dynamicgoal_init(wep, false);
 
 	W_DropEvent(wr_drop,own,wpn,wep,weaponentity);
 
 	if(WepSet_FromWeapon(Weapons_from(wpn)) & WEPSET_SUPERWEAPONS)
 	{
+		Item_SetExpiring(wep, true);
 		if(own.items & IT_UNLIMITED_SUPERWEAPONS)
 		{
 			wep.superweapons_finished = time + autocvar_g_balance_superweapons_time;
@@ -62,10 +63,10 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 		else
 		{
 			int superweapons = 1;
-			FOREACH(Weapons, it != WEP_Null, LAMBDA(
+			FOREACH(Weapons, it != WEP_Null, {
 				WepSet set = it.m_wepset;
 				if((set & WEPSET_SUPERWEAPONS) && (own.weapons & set)) ++superweapons;
-			));
+			});
 			if(superweapons <= 1)
 			{
 				wep.superweapons_finished = own.superweapons_finished;
@@ -90,7 +91,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 	wep.pickup_anyway = true; // these are ALWAYS pickable
 
 	//wa = W_AmmoItemCode(wpn);
-	if(ammotype == ammo_none)
+	if(ammotype == RESOURCE_NONE)
 	{
 		return "";
 	}
@@ -104,11 +105,10 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 			int i = own.(weaponentity).m_weapon.m_id;
 			if(own.(weaponentity).(weapon_load[i]) > 0)
 			{
-				own.(ammotype) += own.(weaponentity).(weapon_load[i]);
+				GiveResource(own, ammotype, own.(weaponentity).(weapon_load[i]));
 				own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading
 			}
-
-			wep.(ammotype) = 0;
+			SetResourceAmount(wep, ammotype, 0);
 		}
 		else if(doreduce)
 		{
@@ -116,22 +116,23 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 			int i = own.(weaponentity).m_weapon.m_id;
 			if(own.(weaponentity).(weapon_load[i]) > 0)
 			{
-				own.(ammotype) += own.(weaponentity).(weapon_load[i]);
+				GiveResource(own, ammotype, own.(weaponentity).(weapon_load[i]));
 				own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading
 			}
 
-			thisammo = min(own.(ammotype), wep.(ammotype));
-			wep.(ammotype) = thisammo;
-			own.(ammotype) -= thisammo;
+			float ownderammo = GetResourceAmount(own, ammotype);
+			thisammo = min(ownderammo, GetResourceAmount(wep, ammotype));
+			SetResourceAmount(wep, ammotype, thisammo);
+			SetResourceAmount(own, ammotype, ownderammo - thisammo);
 
-			switch(ammotype)
+			switch (ammotype)
 			{
-				case ammo_shells:  s = sprintf("%s and %d shells", s, thisammo);  break;
-				case ammo_nails:   s = sprintf("%s and %d nails", s, thisammo);   break;
-				case ammo_rockets: s = sprintf("%s and %d rockets", s, thisammo); break;
-				case ammo_cells:   s = sprintf("%s and %d cells", s, thisammo);   break;
-				case ammo_plasma:  s = sprintf("%s and %d plasma", s, thisammo);  break;
-				case ammo_fuel:    s = sprintf("%s and %d fuel", s, thisammo);    break;
+				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;
 			}
 
 			s = substring(s, 5, -1);
@@ -148,8 +149,6 @@ bool W_IsWeaponThrowable(entity this, int w)
 		return false;
 	if (g_weaponarena)
 		return 0;
-	if (g_cts)
-		return 0;
     if(w == WEP_Null.m_id)
         return false;
 
@@ -159,7 +158,7 @@ bool W_IsWeaponThrowable(entity this, int w)
 		// start weapons that take no ammo can't be dropped (this prevents dropping the laser, as long as it continues to use no ammo)
 		if(start_items & IT_UNLIMITED_WEAPON_AMMO)
 			return false;
-		if((Weapons_from(w)).ammo_field == ammo_none)
+		if((Weapons_from(w)).ammo_type == RESOURCE_NONE)
 			return false;
 	}
 	return true;
@@ -194,9 +193,9 @@ void W_ThrowWeapon(entity this, .entity weaponentity, vector velo, vector delta,
 	Send_Notification(NOTIF_ONE, this, MSG_MULTI, ITEM_WEAPON_DROP, a, w.m_id);
 }
 
-void SpawnThrownWeapon(entity this, vector org, float w, .entity weaponentity)
+void SpawnThrownWeapon(entity this, vector org, Weapon wep, .entity weaponentity)
 {
-	entity wep = this.(weaponentity).m_weapon;
+	//entity wep = this.(weaponentity).m_weapon;
 
 	if(this.weapons & WepSet_FromWeapon(wep))
 		if(W_IsWeaponThrowable(this, wep.m_id))