X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_assault.qc;h=6c6d74a023b69011700cee194018e80a7571f61a;hb=cc5082d6abb23b219cae238ba35cef05be08848a;hp=938cdd748bd60be5aebc661e36bd64fa868d7184;hpb=3220cab5a7b69ced4a641504a6a5f4eccf2d3bfc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator/gamemode_assault.qc b/qcsrc/server/mutators/mutator/gamemode_assault.qc
index 938cdd748..6c6d74a02 100644
--- a/qcsrc/server/mutators/mutator/gamemode_assault.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_assault.qc
@@ -140,18 +140,17 @@ void assault_objective_decrease_use(entity this, entity actor, entity trigger)
 
 void assault_setenemytoobjective(entity this)
 {
-	entity objective;
-	for(objective = NULL; (objective = find(objective, targetname, this.target)); )
+	FOREACH_ENTITY_STRING(targetname, this.target,
 	{
-		if(objective.classname == "target_objective")
+		if(it.classname == "target_objective")
 		{
 			if(this.enemy == NULL)
-				this.enemy = objective;
+				this.enemy = it;
 			else
 				objerror(this, "more than one objective as target - fix the map!");
 			break;
 		}
-	}
+	});
 
 	if(this.enemy == NULL)
 		objerror(this, "no objective as target - fix the map!");
@@ -167,32 +166,32 @@ bool assault_decreaser_sprite_visible(entity this, entity player, entity view)
 
 void target_objective_decrease_activate(entity this)
 {
-	entity ent, spr;
+	entity spr;
 	this.owner = NULL;
-	for(ent = NULL; (ent = find(ent, target, this.targetname)); )
+	FOREACH_ENTITY_STRING(target, this.targetname,
 	{
-		if(ent.assault_sprite != NULL)
+		if(it.assault_sprite != NULL)
 		{
-			WaypointSprite_Disown(ent.assault_sprite, waypointsprite_deadlifetime);
-			if(ent.classname == "func_assault_destructible")
-				ent.sprite = NULL; // TODO: just unsetting it?!
+			WaypointSprite_Disown(it.assault_sprite, waypointsprite_deadlifetime);
+			if(it.classname == "func_assault_destructible")
+				it.sprite = NULL; // TODO: just unsetting it?!
 		}
 
-		spr = WaypointSprite_SpawnFixed(WP_Assault, 0.5 * (ent.absmin + ent.absmax), ent, assault_sprite, RADARICON_OBJECTIVE);
+		spr = WaypointSprite_SpawnFixed(WP_Assault, 0.5 * (it.absmin + it.absmax), it, assault_sprite, RADARICON_OBJECTIVE);
 		spr.assault_decreaser = this;
 		spr.waypointsprite_visible_for_player = assault_decreaser_sprite_visible;
 		spr.classname = "sprite_waypoint";
 		WaypointSprite_UpdateRule(spr, assault_attacker_team, SPRITERULE_TEAMPLAY);
-		if(ent.classname == "func_assault_destructible")
+		if(it.classname == "func_assault_destructible")
 		{
 			WaypointSprite_UpdateSprites(spr, WP_AssaultDefend, WP_AssaultDestroy, WP_AssaultDestroy);
-			WaypointSprite_UpdateMaxHealth(spr, ent.max_health);
-			WaypointSprite_UpdateHealth(spr, ent.health);
-			ent.sprite = spr;
+			WaypointSprite_UpdateMaxHealth(spr, it.max_health);
+			WaypointSprite_UpdateHealth(spr, it.health);
+			it.sprite = spr;
 		}
 		else
 			WaypointSprite_UpdateSprites(spr, WP_AssaultDefend, WP_AssaultPush, WP_AssaultPush);
-	}
+	});
 }
 
 void target_objective_decrease_findtarget(entity this)
@@ -426,8 +425,9 @@ spawnfunc(target_assault_roundstart)
 // legacy bot code
 void havocbot_goalrating_ast_targets(entity this, float ratingscale)
 {
-	entity ad, best, wp, tod;
-	float radius, found, bestvalue;
+	entity ad, best, wp;
+	float radius, bestvalue;
+	bool found;
 	vector p;
 
 	ad = findchain(classname, "func_assault_destructible");
@@ -441,18 +441,18 @@ void havocbot_goalrating_ast_targets(entity this, float ratingscale)
 			continue;
 
 		found = false;
-		for(tod = NULL; (tod = find(tod, targetname, ad.target)); )
+		FOREACH_ENTITY_STRING(targetname, ad.target,
 		{
-			if(tod.classname == "target_objective_decrease")
+			if(it.classname == "target_objective_decrease")
 			{
-				if(tod.enemy.health > 0 && tod.enemy.health < ASSAULT_VALUE_INACTIVE)
+				if(it.enemy.health > 0 && it.enemy.health < ASSAULT_VALUE_INACTIVE)
 				{
 				//	dprint(etos(ad),"\n");
 					found = true;
 					break;
 				}
 			}
-		}
+		});
 
 		if(!found)
 		{
@@ -683,7 +683,11 @@ MUTATOR_HOOKFUNCTION(as, OnEntityPreSpawn)
 // scoreboard setup
 void assault_ScoreRules()
 {
-	ScoreRules_basics(2, SFL_SORT_PRIO_SECONDARY, SFL_SORT_PRIO_SECONDARY, true);
+	int teams = 0;
+	teams |= BIT(0);
+	teams |= BIT(1); // always red vs blue
+
+	ScoreRules_basics(teams, SFL_SORT_PRIO_SECONDARY, SFL_SORT_PRIO_SECONDARY, true);
 	ScoreInfo_SetLabel_TeamScore(  ST_ASSAULT_OBJECTIVES,    "objectives",      SFL_SORT_PRIO_PRIMARY);
 	ScoreInfo_SetLabel_PlayerScore(SP_ASSAULT_OBJECTIVES,    "objectives",      SFL_SORT_PRIO_PRIMARY);
 	ScoreRules_basics_end();