X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=03af802e71c12d8b762c0e34df606ba8c096ee3d;hb=530e06120a7b41f6175b1144fedf6903da8c13b0;hp=058bd8292c349160d324e5f761f11a8f5e2ad89a;hpb=ba0988ca930f50286f8cf3b6c114ebc6584964af;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 058bd8292..03af802e7 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -1,5 +1,5 @@
 #if defined(CSQC)
-    #include "../dpdefs/csprogsdefs.qc"
+    #include "../dpdefs/csprogsdefs.qh"
     #include "../common/util.qh"
     #include "../common/buffs.qh"
     #include "../common/weapons/weapons.qh"
@@ -11,8 +11,8 @@
     #include "t_items.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../dpdefs/progsdefs.qc"
-    #include "../dpdefs/dpextensions.qc"
+    #include "../dpdefs/progsdefs.qh"
+    #include "../dpdefs/dpextensions.qh"
     #include "../warpzonelib/util_server.qh"
     #include "../common/constants.qh"
     #include "../common/util.qh"
@@ -425,7 +425,7 @@ void Item_Respawn (void)
 
 	self.think = Item_Think;
 	self.nextthink = time;
-	
+
 	//pointparticles(particleeffectnum("item_respawn"), self.origin + self.mins_z * '0 0 1' + '0 0 48', '0 0 0', 1);
 	pointparticles(particleeffectnum("item_respawn"), self.origin + 0.5 * (self.mins + self.maxs), '0 0 0', 1);
 }
@@ -1139,7 +1139,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 		Item_Reset();
 
     Net_LinkEntity(self, false, 0, ItemSend);
-	
+
 	self.SendFlags |= ISF_SIZE;
 	if(self.angles)
 		self.SendFlags |= ISF_ANGLES;
@@ -1345,6 +1345,7 @@ void spawnfunc_target_items (void)
 {
 	float n, i, j;
 	entity e;
+	string s;
 
 	self.use = target_items_use;
 	if(!self.strength_finished)
@@ -1383,7 +1384,8 @@ void spawnfunc_target_items (void)
 				for(j = WEP_FIRST; j <= WEP_LAST; ++j)
 				{
 					e = get_weaponinfo(j);
-					if(argv(i) == e.netname)
+					s = W_UndeprecateName(argv(i));
+					if(s == e.netname)
 					{
 						self.weapons |= WepSet_FromWeapon(j);
 						if(self.spawnflags == 0 || self.spawnflags == 2)