X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fspawning.qc;h=954bcc46c7da86874ea74996499745898e0f6c68;hb=c58baab5bd2dc4a77eb7d8e97824621d887c8e75;hp=23a3ee67d6aa5ab8d2ba95d302f2b7514ecbdc39;hpb=139a594d29f65508e5d6001e90d4ee4fad82ca66;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 23a3ee67d..954bcc46c 100644
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -1,11 +1,12 @@
 #include "spawning.qh"
 
-#include "weaponsystem.qh"
-#include "../resources.qh"
-#include <server/mutators/_mod.qh>
-#include <common/t_items.qh>
-#include <server/items.qh>
 #include <common/weapons/_all.qh>
+#include <server/items/items.qh>
+#include <server/items/spawning.qh>
+#include <server/mutators/_mod.qh>
+#include <server/resources.qh>
+#include <server/weapons/weaponsystem.qh>
+#include <server/world.qh>
 
 .bool m_isreplaced; ///< Holds whether the weapon has been replaced.
 
@@ -14,7 +15,7 @@ string W_Apply_Weaponreplace(string in)
 	string out = "";
 	FOREACH_WORD(in, true, {
 		string replacement = "";
-		Weapon w = Weapons_fromstr(it);
+		Weapon w = Weapon_from_name(it);
 		if (w)
 		{
             replacement = w.weaponreplace;
@@ -34,7 +35,7 @@ void weapon_defaultspawnfunc(entity this, Weapon wpn)
 	{
 		if (wpn.spawnflags & WEP_FLAG_MUTATORBLOCKED)
 		{
-			LOG_WARNF("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;
 		}
@@ -55,7 +56,7 @@ void weapon_defaultspawnfunc(entity this, Weapon wpn)
 			for (int i = 1; i < t; ++i)
 			{
 				s = argv(i);
-				Weapon wep = Weapons_fromstr(s);
+				Weapon wep = Weapon_from_name(s);
 				if(wep != WEP_Null)
 				{
 					entity replacement = spawn();
@@ -68,7 +69,7 @@ void weapon_defaultspawnfunc(entity this, Weapon wpn)
 		if (t >= 1) // always the case!
 		{
 			s = argv(0);
-			wpn = Weapons_fromstr(s);
+			wpn = Weapon_from_name(s);
 		}
 		if (wpn == WEP_Null)
 		{