X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_subs.qc;h=e8e50c7184134148406c439b092c96e2b5161137;hb=2f215c603bf1b4dd44b9d166180f535c88602e9f;hp=f3fb1a3224ad9ebd186bdd630476baa733b6e980;hpb=83aad9e1a69d8e924df17cdbad05b015c6c6f0fc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index f3fb1a322..e8e50c718 100644
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -8,7 +8,7 @@
 
 spawnfunc(info_null)
 {
-	remove(this);
+	delete(this);
 	// if anything breaks, tell the mapper to fix his map! info_null is meant to remove itself immediately.
 }
 
@@ -51,9 +51,9 @@ void tracebox_antilag_force_wz (entity source, vector v1, vector mi, vector ma,
 	{
 		// take players back into the past
 		FOREACH_CLIENT(IS_PLAYER(it) && it != forent, antilag_takeback(it, CS(it), time - lag));
-		FOREACH_ENTITY_FLAGS(flags, FL_MONSTER, {
-			if(it != forent)
-				antilag_takeback(it, it, time - lag);
+		IL_EACH(g_monsters, it != forent,
+		{
+			antilag_takeback(it, it, time - lag);
 		});
 	}
 
@@ -67,9 +67,9 @@ void tracebox_antilag_force_wz (entity source, vector v1, vector mi, vector ma,
 	if (lag)
 	{
 		FOREACH_CLIENT(IS_PLAYER(it) && it != forent, antilag_restore(it, CS(it)));
-		FOREACH_ENTITY_FLAGS(flags, FL_MONSTER, {
-			if (it != forent)
-				antilag_restore(it, it);
+		IL_EACH(g_monsters, it != forent,
+		{
+			antilag_restore(it, it);
 		});
 	}
 
@@ -141,10 +141,10 @@ float tracebox_inverted (vector v1, vector mi, vector ma, vector v2, float nomon
 
 		if(c == 50)
 		{
-			LOG_TRACE("HOLY SHIT! When tracing from ", vtos(v1), " to ", vtos(v2), "\n");
-			LOG_TRACE("  Nudging gets us nowhere at ", vtos(pos), "\n");
-			LOG_TRACE("  trace_endpos is ", vtos(trace_endpos), "\n");
-			LOG_TRACE("  trace distance is ", ftos(vlen(pos - trace_endpos)), "\n");
+			LOG_TRACE("HOLY SHIT! When tracing from ", vtos(v1), " to ", vtos(v2));
+			LOG_TRACE("  Nudging gets us nowhere at ", vtos(pos));
+			LOG_TRACE("  trace_endpos is ", vtos(trace_endpos));
+			LOG_TRACE("  trace distance is ", ftos(vlen(pos - trace_endpos)));
 		}
 
 		stopentity = trace_ent;
@@ -281,7 +281,7 @@ void LODmodel_attach(entity this)
 		if(e)
 		{
 			this.lodmodel1 = e.model;
-			remove(e);
+			delete(e);
 		}
 	}
 	if(this.lodtarget2 != "")
@@ -290,7 +290,7 @@ void LODmodel_attach(entity this)
 		if(e)
 		{
 			this.lodmodel2 = e.model;
-			remove(e);
+			delete(e);
 		}
 	}