From: Mario <mario@smbclan.net>
Date: Sun, 19 Jun 2016 19:04:00 +0000 (+1000)
Subject: Speed up some more loops
X-Git-Tag: xonotic-v0.8.2~772
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6de14b1fa58d209116b87ac035d513beb5ed0599;p=xonotic%2Fxonotic-data.pk3dir.git

Speed up some more loops
---

diff --git a/qcsrc/common/mutators/mutator/sandbox/sandbox.qc b/qcsrc/common/mutators/mutator/sandbox/sandbox.qc
index bc4cb6775..1805d7201 100644
--- a/qcsrc/common/mutators/mutator/sandbox/sandbox.qc
+++ b/qcsrc/common/mutators/mutator/sandbox/sandbox.qc
@@ -142,25 +142,23 @@ void sandbox_ObjectAttach_Remove(entity e)
 {
 	// detaches any object attached to e
 
-	entity head;
-	for(head = NULL; (head = find(head, classname, "object")); )
+	FOREACH_ENTITY_ENT(owner, e,
 	{
-		if(head.owner == e)
-		{
-			vector org;
-			org = gettaginfo(head, 0);
-			setattachment(head, NULL, "");
-			head.owner = NULL;
-
-			// objects change origin and angles when detached, so apply previous position
-			setorigin(head, org);
-			head.angles = e.angles; // don't allow detached objects to spin or roll
-
-			head.solid = head.old_solid; // restore persisted solidity
-			head.movetype = head.old_movetype; // restore persisted physics
-			head.takedamage = DAMAGE_AIM;
-		}
-	}
+		if(it.classname != "object") continue;
+
+		vector org;
+		org = gettaginfo(it, 0);
+		setattachment(it, NULL, "");
+		it.owner = NULL;
+
+		// objects change origin and angles when detached, so apply previous position
+		setorigin(it, org);
+		it.angles = e.angles; // don't allow detached objects to spin or roll
+
+		it.solid = it.old_solid; // restore persisted solidity
+		it.movetype = it.old_movetype; // restore persisted physics
+		it.takedamage = DAMAGE_AIM;
+	});
 }
 
 entity sandbox_ObjectSpawn(entity this, float database)
@@ -462,7 +460,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand)
 		switch(argv(1))
 		{
 			entity e;
-			float i;
+			int j;
 			string s;
 
 			// ---------------- COMMAND: HELP ----------------
@@ -704,8 +702,8 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand)
 							if(e.material)	strunzone(e.material);
 							if(argv(3))
 							{
-								for (i = 1; i <= 5; i++) // precache material sounds, 5 in total
-									precache_sound(strcat("object/impact_", argv(3), "_", ftos(i), ".wav"));
+								for (j = 1; j <= 5; j++) // precache material sounds, 5 in total
+									precache_sound(strcat("object/impact_", argv(3), "_", ftos(j), ".wav"));
 								e.material = strzone(argv(3));
 							}
 							else
@@ -783,20 +781,18 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand)
 						case "attachments":
 							// this should show the same info as 'mesh' but for attachments
 							s = "";
-							entity head;
-							i = 0;
-							for(head = NULL; (head = find(head, classname, "object")); )
+							j = 0;
+							FOREACH_ENTITY_ENT(owner, e,
 							{
-								if(head.owner == e)
-								{
-									++i; // start from 1
-									gettaginfo(e, head.tag_index);
-									s = strcat(s, "^1attachment ", ftos(i), "^7 has mesh \"^3", head.model, "^7\" at animation frame ^3", ftos(head.frame));
-									s = strcat(s, "^7 and is attached to bone \"^5", gettaginfo_name, "^7\", ");
-								}
-							}
-							if(i) // object contains attachments
-								print_to(player, strcat("^2SANDBOX - INFO: ^7Object contains the following ^1", ftos(i), "^7 attachment(s): ", s));
+								if(it.classname != "object") continue;
+
+								++j; // start from 1
+								gettaginfo(e, it.tag_index);
+								s = strcat(s, "^1attachment ", ftos(j), "^7 has mesh \"^3", it.model, "^7\" at animation frame ^3", ftos(it.frame));
+								s = strcat(s, "^7 and is attached to bone \"^5", gettaginfo_name, "^7\", ");
+							});
+							if(j) // object contains attachments
+								print_to(player, strcat("^2SANDBOX - INFO: ^7Object contains the following ^1", ftos(j), "^7 attachment(s): ", s));
 							else
 								print_to(player, "^2SANDBOX - INFO: ^7Object contains no attachments");
 							return true;