X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_invasion.qc;h=b1a74f2aa998c92e28614b46905f4e9479eb8ca2;hp=de1aa5a2d466ae0999f4956b610df6d40ddeb739;hb=87cbf00c7734cf2910502c217b5c5157511ba5ea;hpb=ccf145b9b0372a5b402465ab578ca48d943ffd88

diff --git a/qcsrc/server/mutators/mutator/gamemode_invasion.qc b/qcsrc/server/mutators/mutator/gamemode_invasion.qc
index de1aa5a2d4..b1a74f2aa9 100644
--- a/qcsrc/server/mutators/mutator/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_invasion.qc
@@ -193,7 +193,11 @@ float Invasion_CheckWinner()
 {
 	if(round_handler_GetEndTime() > 0 && round_handler_GetEndTime() - time <= 0)
 	{
-		FOREACH_ENTITY_FLAGS(flags, FL_MONSTER, LAMBDA(Monster_Remove(it)));
+		IL_EACH(g_monsters, true,
+		{
+			Monster_Remove(it);
+		});
+		IL_CLEAR(g_monsters);
 
 		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ROUND_OVER);
 		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_OVER);
@@ -203,23 +207,21 @@ float Invasion_CheckWinner()
 
 	float total_alive_monsters = 0, supermonster_count = 0, red_alive = 0, blue_alive = 0, yellow_alive = 0, pink_alive = 0;
 
-	FOREACH_ENTITY_FLAGS(flags, FL_MONSTER, LAMBDA(
-		if(it.health > 0)
-		{
-			if((get_monsterinfo(it.monsterid)).spawnflags & MON_FLAG_SUPERMONSTER)
-				++supermonster_count;
-			++total_alive_monsters;
+	IL_EACH(g_monsters, it.health > 0,
+	{
+		if((get_monsterinfo(it.monsterid)).spawnflags & MON_FLAG_SUPERMONSTER)
+			++supermonster_count;
+		++total_alive_monsters;
 
-			if(teamplay)
-			switch(it.team)
-			{
-				case NUM_TEAM_1: ++red_alive; break;
-				case NUM_TEAM_2: ++blue_alive; break;
-				case NUM_TEAM_3: ++yellow_alive; break;
-				case NUM_TEAM_4: ++pink_alive; break;
-			}
+		if(teamplay)
+		switch(it.team)
+		{
+			case NUM_TEAM_1: ++red_alive; break;
+			case NUM_TEAM_2: ++blue_alive; break;
+			case NUM_TEAM_3: ++yellow_alive; break;
+			case NUM_TEAM_4: ++pink_alive; break;
 		}
-	));
+	});
 
 	if((total_alive_monsters + inv_numkilled) < inv_maxspawned && inv_maxcurrent < inv_maxspawned)
 	{
@@ -272,7 +274,11 @@ float Invasion_CheckWinner()
 		));
 	}
 
-	FOREACH_ENTITY_FLAGS(flags, FL_MONSTER, LAMBDA(Monster_Remove(it)));
+	IL_EACH(g_monsters, true,
+	{
+		Monster_Remove(it);
+	});
+	IL_CLEAR(g_monsters);
 
 	if(teamplay)
 	{