X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fgamemodes%2Fgamemode%2Fonslaught%2Fsv_onslaught.qc;h=a18ce34c5d06e83ad98d95a2e606f0034b5bc333;hb=7c8f38e643c87bf9c02c2265ca43714c57ebe331;hp=8e60bc30897a4ac897ea19c594630b68987989a3;hpb=a491650510dce3f774cce457ebf15ddcafcf393f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
index 8e60bc308..a18ce34c5 100644
--- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
@@ -827,7 +827,7 @@ void ons_GeneratorDamage(entity this, entity inflictor, entity attacker, float d
 	{
 		if (this.isshielded)
 		{
-			// this is protected by a shield, so ignore the damage
+			// generator is protected by a shield, so ignore the damage
 			if (time > this.pain_finished)
 				if (IS_PLAYER(attacker))
 				{
@@ -1685,7 +1685,7 @@ MUTATOR_HOOKFUNCTION(ons, PlayerSpawn)
 		{
 			if(SAME_TEAM(tmp_entity, player))
 			if(random_target)
-				RandomSelection_Add(tmp_entity, 0, string_null, 1, 1);
+				RandomSelection_AddEnt(tmp_entity, 1, 1);
 			else if(vlen2(tmp_entity.origin - spawn_loc) <= vlen2(closest_target.origin - spawn_loc) || closest_target == NULL)
 				closest_target = tmp_entity;
 		}
@@ -1732,7 +1732,7 @@ MUTATOR_HOOKFUNCTION(ons, PlayerSpawn)
 		for(tmp_entity = ons_worldgeneratorlist; tmp_entity; tmp_entity = tmp_entity.ons_worldgeneratornext)
 		{
 			if(random_target)
-				RandomSelection_Add(tmp_entity, 0, string_null, 1, 1);
+				RandomSelection_AddEnt(tmp_entity, 1, 1);
 			else
 			{
 				if(SAME_TEAM(tmp_entity, player))
@@ -1871,7 +1871,7 @@ MUTATOR_HOOKFUNCTION(ons, HavocBot_ChooseRole)
 	return true;
 }
 
-MUTATOR_HOOKFUNCTION(ons, GetTeamCount)
+MUTATOR_HOOKFUNCTION(ons, CheckAllowedTeams)
 {
 	// onslaught is special
 	for(entity tmp_entity = ons_worldgeneratorlist; tmp_entity; tmp_entity = tmp_entity.ons_worldgeneratornext)