X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fspawning.qc;h=17f2ddeeee2bb567271f1f689c8376494168a5a6;hb=cac7a0ffc2bb7212fdd92f5c9782b09b65279fe1;hp=748f434eb325dd3cf002279d599cd8ed2dade4ef;hpb=eac60648c4017e495060dd3ba9e50ac4bad5000a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 748f434eb..17f2ddeee 100644
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -1,9 +1,13 @@
 #include "spawning.qh"
 
 #include "weaponsystem.qh"
-#include "../mutators/all.qh"
+#include "../resources.qh"
+#include "../mutators/_mod.qh"
 #include <common/t_items.qh>
-#include <common/weapons/all.qh>
+#include <server/items.qh>
+#include <common/weapons/_all.qh>
+
+.bool m_isreplaced; ///< Holds whether the weapon has been replaced.
 
 string W_Apply_Weaponreplace(string in)
 {
@@ -25,11 +29,13 @@ string W_Apply_Weaponreplace(string in)
 void weapon_defaultspawnfunc(entity this, Weapon e)
 {
 	Weapon wpn = e;
-	if (this.classname != "droppedweapon" && this.classname != "replacedweapon")
+	e = wpn = wpn.m_spawnfunc_hookreplace(wpn, this);
+	this.classname = wpn.m_canonical_spawnfunc;
+	if (!Item_IsLoot(this) && !this.m_isreplaced)
 	{
 		if (e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
 		{
-			LOG_MAPWARNF("Attempted to spawn a mutator-blocked weapon rejected: prvm_edict server %i", this);
+			LOG_WARNF("Attempted to spawn a mutator-blocked weapon rejected: prvm_edict server %i", this);
 			startitem_failed = true;
 			return;
 		}
@@ -39,7 +45,7 @@ void weapon_defaultspawnfunc(entity this, Weapon e)
 		s = M_ARGV(2, string);
 		if (s == "")
 		{
-			remove(this);
+			delete(this);
 			startitem_failed = true;
 			return;
 		}
@@ -50,38 +56,45 @@ void weapon_defaultspawnfunc(entity this, Weapon e)
 			for (int i = 1; i < t; ++i)
 			{
 				s = argv(i);
-				FOREACH(Weapons, it != WEP_Null, LAMBDA(
+				FOREACH(Weapons, it != WEP_Null, {
 					if(it.netname == s)
 					{
 						entity replacement = spawn();
 						copyentity(this, replacement);
-						replacement.classname = "replacedweapon";
+						replacement.m_isreplaced = true;
 						weapon_defaultspawnfunc(replacement, it);
 						break;
 					}
-				));
+				});
 			}
 		}
 		if (t >= 1) // always the case!
 		{
 			s = argv(0);
 			wpn = WEP_Null;
-			FOREACH(Weapons, it != WEP_Null, LAMBDA(
+			FOREACH(Weapons, it != WEP_Null, {
 				if(it.netname == s)
 				{
 					wpn = it;
 					break;
 				}
-			));
+			});
 		}
 		if (wpn == WEP_Null)
 		{
-			remove(this);
+			delete(this);
 			startitem_failed = true;
 			return;
 		}
 	}
 
+	if (!Item_IsDefinitionAllowed(wpn.m_pickup))
+	{
+		delete(this);
+		startitem_failed = true;
+		return;
+	}
+
 	if (!this.respawntime)
 	{
 		if (wpn.spawnflags & WEP_FLAG_SUPERWEAPON)
@@ -101,16 +114,16 @@ void weapon_defaultspawnfunc(entity this, Weapon e)
 			this.superweapons_finished = autocvar_g_balance_superweapons_time;
 
 	// if we don't already have ammo, give us some ammo
-	if (!this.(wpn.ammo_field))
+	if ((wpn.ammo_type != RESOURCE_NONE) && !GetResourceAmount(this, wpn.ammo_type))
 	{
-		switch (wpn.ammo_field)
+		switch (wpn.ammo_type)
 		{
-			case ammo_shells:  this.ammo_shells  = cvar("g_pickup_shells_weapon");  break;
-			case ammo_nails:   this.ammo_nails   = cvar("g_pickup_nails_weapon");   break;
-			case ammo_rockets: this.ammo_rockets = cvar("g_pickup_rockets_weapon"); break;
-			case ammo_cells:   this.ammo_cells   = cvar("g_pickup_cells_weapon");   break;
-			case ammo_plasma:  this.ammo_plasma  = cvar("g_pickup_plasma_weapon");  break;
-			case ammo_fuel:    this.ammo_fuel    = cvar("g_pickup_fuel_weapon");    break;
+			case RESOURCE_SHELLS:  SetResourceAmount(this, wpn.ammo_type, cvar("g_pickup_shells_weapon"));  break;
+			case RESOURCE_BULLETS: SetResourceAmount(this, wpn.ammo_type, cvar("g_pickup_nails_weapon"));   break;
+			case RESOURCE_ROCKETS: SetResourceAmount(this, wpn.ammo_type, cvar("g_pickup_rockets_weapon")); break;
+			case RESOURCE_CELLS:   SetResourceAmount(this, wpn.ammo_type, cvar("g_pickup_cells_weapon"));   break;
+			case RESOURCE_PLASMA:  SetResourceAmount(this, wpn.ammo_type, cvar("g_pickup_plasma_weapon"));  break;
+			case RESOURCE_FUEL:    SetResourceAmount(this, wpn.ammo_type, cvar("g_pickup_fuel_weapon"));    break;
 		}
 	}
 
@@ -133,6 +146,9 @@ void weapon_defaultspawnfunc(entity this, Weapon e)
 	if (g_pickup_weapons_anyway)
 		this.pickup_anyway = true;
 
+	if(!this.owner)
+		this.glowmod = wpn.wpcolor;
+
 	GameItem def = wpn.m_pickup;
 	_StartItem(
 		this,