X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_quake3.qc;h=254130f88c443cd4105e65ed20210faa4bbbb849;hb=9380d852b4541b6e3906313f34fc666997da6fa7;hp=1bdb49765d76127e40bfd69b7b26c74713cd8a0c;hpb=b9671f63469586007314131f3f53728795c035cd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 1bdb49765..254130f88 100644
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -1,6 +1,6 @@
 #include "t_quake3.qh"
 
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
 
 spawnfunc(weapon_crylink);
 spawnfunc(weapon_electro);
@@ -97,41 +97,41 @@ spawnfunc(target_init)
 // weapon give ent from defrag
 void target_give_init(entity this)
 {
-	entity targ;
-	for (targ = NULL; (targ = find(targ, targetname, this.target)); ) {
-		if (targ.classname == "weapon_rocketlauncher" || targ.classname == "weapon_devastator") {
-			this.ammo_rockets += targ.count * WEP_CVAR(devastator, ammo);
+	IL_EACH(g_items, it.targetname == this.target,
+	{
+		if (it.classname == "weapon_rocketlauncher" || it.classname == "weapon_devastator") {
+			this.ammo_rockets += it.count * WEP_CVAR(devastator, ammo);
 			this.netname = "devastator";
 		}
-		else if (targ.classname == "weapon_plasmagun") {
-			this.ammo_rockets += targ.count * WEP_CVAR_PRI(hagar, ammo); // WEAPONTODO
+		else if (it.classname == "weapon_plasmagun") {
+			this.ammo_rockets += it.count * WEP_CVAR_PRI(hagar, ammo); // WEAPONTODO
 			if(this.netname == "")
 				this.netname = "hagar";
 			else
 				this.netname = strcat(this.netname, " hagar");
 		}
-		else if (targ.classname == "weapon_bfg") {
-			this.ammo_cells += targ.count * WEP_CVAR_PRI(crylink, ammo);
+		else if (it.classname == "weapon_bfg") {
+			this.ammo_cells += it.count * WEP_CVAR_PRI(crylink, ammo);
 			if(this.netname == "")
 				this.netname = "crylink";
 			else
 				this.netname = strcat(this.netname, " crylink");
 		}
-		else if (targ.classname == "weapon_grenadelauncher" || targ.classname == "weapon_mortar") {
-			this.ammo_rockets += targ.count * WEP_CVAR_PRI(mortar, ammo); // WEAPONTODO
+		else if (it.classname == "weapon_grenadelauncher" || it.classname == "weapon_mortar") {
+			this.ammo_rockets += it.count * WEP_CVAR_PRI(mortar, ammo); // WEAPONTODO
 			if(this.netname == "")
 				this.netname = "mortar";
 			else
 				this.netname = strcat(this.netname, " mortar");
 		}
-		else if (targ.classname == "item_armor_body")
+		else if (it.classname == "item_armor_body")
 			this.armorvalue = 100;
-		else if (targ.classname == "item_health_mega")
+		else if (it.classname == "item_health_mega")
 			this.health = 200;
-		//remove(targ); // removing ents in init functions causes havoc, workaround:
-        setthink(targ, SUB_Remove);
-        targ.nextthink = time;
-	}
+		//remove(it); // removing ents in init functions causes havoc, workaround:
+        setthink(it, SUB_Remove);
+        it.nextthink = time;
+	});
 	this.spawnflags = 2;
 	spawnfunc_target_items(this);
 	InitializeEntity(this, target_init_verify, INITPRIO_FINDTARGET);