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=5bf26c4b8840f5fb3da80d32c0fd815fef1451fb;hb=87cbf00c7734cf2910502c217b5c5157511ba5ea;hpb=e9b0f3859726cfc5f17ba0a046147404fb79f5be

diff --git a/qcsrc/server/mutators/mutator/gamemode_invasion.qc b/qcsrc/server/mutators/mutator/gamemode_invasion.qc
index 5bf26c4b88..b1a74f2aa9 100644
--- a/qcsrc/server/mutators/mutator/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_invasion.qc
@@ -104,7 +104,7 @@ float invasion_PickMonster(float supermonster_count)
 		if((mon.spawnflags & MONSTER_TYPE_FLY) || (mon.spawnflags & MONSTER_TYPE_SWIM) || ((mon.spawnflags & MON_FLAG_SUPERMONSTER) && supermonster_count >= 1))
 			continue; // flying/swimming monsters not yet supported
 
-		RandomSelection_Add(world, i, string_null, 1, 1);
+		RandomSelection_Add(NULL, i, string_null, 1, 1);
 	}
 
 	return RandomSelection_chosen_float;
@@ -112,15 +112,13 @@ float invasion_PickMonster(float supermonster_count)
 
 entity invasion_PickSpawn()
 {
-	entity e;
-
 	RandomSelection_Init();
 
-	for(e = world;(e = find(e, classname, "invasion_spawnpoint")); )
+	FOREACH_ENTITY_CLASS("invasion_spawnpoint", true,
 	{
-		RandomSelection_Add(e, 0, string_null, 1, ((time >= e.spawnshieldtime) ? 0.2 : 1)); // give recently used spawnpoints a very low rating
-		e.spawnshieldtime = time + autocvar_g_invasion_spawnpoint_spawn_delay;
-	}
+		RandomSelection_Add(it, 0, string_null, 1, ((time >= it.spawnshieldtime) ? 0.2 : 1)); // give recently used spawnpoints a very low rating
+		it.spawnshieldtime = time + autocvar_g_invasion_spawnpoint_spawn_delay;
+	});
 
 	return RandomSelection_chosen_ent;
 }
@@ -131,14 +129,14 @@ void invasion_SpawnChosenMonster(float mon)
 
 	spawn_point = invasion_PickSpawn();
 
-	if(spawn_point == world)
+	if(spawn_point == NULL)
 	{
 		LOG_TRACE("Warning: couldn't find any invasion_spawnpoint spawnpoints, attempting to spawn monsters in random locations\n");
 		entity e = spawn();
 		setsize(e, (get_monsterinfo(mon)).mins, (get_monsterinfo(mon)).maxs);
 
 		if(MoveToRandomMapLocation(e, DPCONTENTS_SOLID | DPCONTENTS_CORPSE | DPCONTENTS_PLAYERCLIP, DPCONTENTS_SLIME | DPCONTENTS_LAVA | DPCONTENTS_SKY | DPCONTENTS_BODY | DPCONTENTS_DONOTENTER, Q3SURFACEFLAG_SKY, 10, 1024, 256))
-			monster = spawnmonster("", mon, world, world, e.origin, false, false, 2);
+			monster = spawnmonster("", mon, NULL, NULL, e.origin, false, false, 2);
 		else return;
 
 		setthink(e, SUB_Remove);
@@ -157,10 +155,10 @@ void invasion_SpawnChosenMonster(float mon)
 	else
 	{
 		RandomSelection_Init();
-		if(inv_monsters_perteam[NUM_TEAM_1] > 0) RandomSelection_Add(world, NUM_TEAM_1, string_null, 1, 1);
-		if(inv_monsters_perteam[NUM_TEAM_2] > 0) RandomSelection_Add(world, NUM_TEAM_2, string_null, 1, 1);
-		if(invasion_teams >= 3) if(inv_monsters_perteam[NUM_TEAM_3] > 0) { RandomSelection_Add(world, NUM_TEAM_3, string_null, 1, 1); }
-		if(invasion_teams >= 4) if(inv_monsters_perteam[NUM_TEAM_4] > 0) { RandomSelection_Add(world, NUM_TEAM_4, string_null, 1, 1); }
+		if(inv_monsters_perteam[NUM_TEAM_1] > 0) RandomSelection_Add(NULL, NUM_TEAM_1, string_null, 1, 1);
+		if(inv_monsters_perteam[NUM_TEAM_2] > 0) RandomSelection_Add(NULL, NUM_TEAM_2, string_null, 1, 1);
+		if(invasion_teams >= 3) if(inv_monsters_perteam[NUM_TEAM_3] > 0) { RandomSelection_Add(NULL, NUM_TEAM_3, string_null, 1, 1); }
+		if(invasion_teams >= 4) if(inv_monsters_perteam[NUM_TEAM_4] > 0) { RandomSelection_Add(NULL, NUM_TEAM_4, string_null, 1, 1); }
 
 		monster.team = RandomSelection_chosen_float;
 	}
@@ -195,33 +193,35 @@ 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, world, MSG_CENTER, CENTER_ROUND_OVER);
-		Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_OVER);
+		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ROUND_OVER);
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_OVER);
 		round_handler_Init(5, autocvar_g_invasion_warmup, autocvar_g_invasion_round_timelimit);
 		return 1;
 	}
 
 	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)
 	{
@@ -245,7 +245,7 @@ float Invasion_CheckWinner()
 	else if(inv_numkilled < inv_maxspawned)
 		return 0;
 
-	entity winner = world;
+	entity winner = NULL;
 	float winning_score = 0, winner_team = 0;
 
 
@@ -274,20 +274,24 @@ 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)
 	{
 		if(winner_team)
 		{
-			Send_Notification(NOTIF_ALL, world, MSG_CENTER, APP_TEAM_NUM(winner_team, CENTER_ROUND_TEAM_WIN));
-			Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM(winner_team, INFO_ROUND_TEAM_WIN));
+			Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, APP_TEAM_NUM(winner_team, CENTER_ROUND_TEAM_WIN));
+			Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(winner_team, INFO_ROUND_TEAM_WIN));
 		}
 	}
 	else if(winner)
 	{
-		Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_PLAYER_WIN, winner.netname);
-		Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_PLAYER_WIN, winner.netname);
+		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ROUND_PLAYER_WIN, winner.netname);
+		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_PLAYER_WIN, winner.netname);
 	}
 
 	round_handler_Init(5, autocvar_g_invasion_warmup, autocvar_g_invasion_round_timelimit);
@@ -350,29 +354,27 @@ MUTATOR_HOOKFUNCTION(inv, MonsterDies)
 				TeamScore_AddToTeam(frag_attacker.team, ST_INV_KILLS, +1);
 		}
 	}
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(inv, MonsterSpawn)
-{SELFPARAM();
-	if(!(self.spawnflags & MONSTERFLAG_SPAWNED))
+{
+	entity mon = M_ARGV(0, entity);
+
+	if(!(mon.spawnflags & MONSTERFLAG_SPAWNED))
 		return true;
 
-	if(!(self.spawnflags & MONSTERFLAG_RESPAWNED))
+	if(!(mon.spawnflags & MONSTERFLAG_RESPAWNED))
 	{
 		inv_numspawned += 1;
 		inv_maxcurrent += 1;
 	}
 
-	self.monster_skill = inv_monsterskill;
-
-	if((get_monsterinfo(self.monsterid)).spawnflags & MON_FLAG_SUPERMONSTER)
-		Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_INVASION_SUPERMONSTER, self.monster_name);
+	mon.monster_skill = inv_monsterskill;
 
-	self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP;
+	if((get_monsterinfo(mon.monsterid)).spawnflags & MON_FLAG_SUPERMONSTER)
+		Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_INVASION_SUPERMONSTER, mon.monster_name);
 
-	return false;
+	mon.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP;
 }
 
 MUTATOR_HOOKFUNCTION(inv, OnEntityPreSpawn)
@@ -382,16 +384,12 @@ MUTATOR_HOOKFUNCTION(inv, OnEntityPreSpawn)
 	if(startsWith(ent.classname, "monster_"))
 	if(!(ent.spawnflags & MONSTERFLAG_SPAWNED))
 		return true;
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(inv, SV_StartFrame)
 {
 	monsters_total = inv_maxspawned; // TODO: make sure numspawned never exceeds maxspawned
 	monsters_killed = inv_numkilled;
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(inv, PlayerRegen)
@@ -405,7 +403,6 @@ MUTATOR_HOOKFUNCTION(inv, PlayerSpawn)
 	entity player = M_ARGV(0, entity);
 
 	player.bot_attack = false;
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(inv, PlayerDamage_Calculate)
@@ -423,14 +420,12 @@ MUTATOR_HOOKFUNCTION(inv, PlayerDamage_Calculate)
 		M_ARGV(4, float) = frag_damage;
 		M_ARGV(6, vector) = frag_force;
 	}
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(inv, SV_ParseClientCommand)
 {
 	if(MUTATOR_RETURNVALUE) // command was already handled?
-		return false;
+		return;
 
 	entity player = M_ARGV(0, entity);
 	string cmd_name = M_ARGV(1, string);
@@ -447,23 +442,20 @@ MUTATOR_HOOKFUNCTION(inv, SV_ParseClientCommand)
 
 		return true;
 	}
-
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(inv, BotShouldAttack)
 {
-	if(!IS_MONSTER(checkentity))
-		return true;
+	entity targ = M_ARGV(1, entity);
 
-	return false;
+	if(!IS_MONSTER(targ))
+		return true;
 }
 
 MUTATOR_HOOKFUNCTION(inv, SetStartItems)
 {
 	start_health = 200;
 	start_armorvalue = 200;
-	return false;
 }
 
 MUTATOR_HOOKFUNCTION(inv, AccuracyTargetValid)
@@ -478,6 +470,7 @@ MUTATOR_HOOKFUNCTION(inv, AccuracyTargetValid)
 MUTATOR_HOOKFUNCTION(inv, AllowMobSpawning)
 {
 	// monster spawning disabled during an invasion
+	M_ARGV(1, string) = "You cannot spawn monsters during an invasion!";
 	return true;
 }
 
@@ -488,13 +481,13 @@ MUTATOR_HOOKFUNCTION(inv, GetTeamCount, CBC_ORDER_EXCLUSIVE)
 
 MUTATOR_HOOKFUNCTION(inv, AllowMobButcher)
 {
-	ret_string = "This command does not work during an invasion!";
+	M_ARGV(0, string) = "This command does not work during an invasion!";
 	return true;
 }
 
-void invasion_ScoreRules(float inv_teams)
+void invasion_ScoreRules(int inv_teams)
 {
-	if(inv_teams) { CheckAllowedTeams(world); }
+	if(inv_teams) { CheckAllowedTeams(NULL); }
 	ScoreRules_basics(inv_teams, 0, 0, false);
 	if(inv_teams) ScoreInfo_SetLabel_TeamScore(ST_INV_KILLS, "frags", SFL_SORT_PRIO_PRIMARY);
 	ScoreInfo_SetLabel_PlayerScore(SP_KILLS, "frags", ((inv_teams) ? SFL_SORT_PRIO_SECONDARY : SFL_SORT_PRIO_PRIMARY));
@@ -504,7 +497,16 @@ void invasion_ScoreRules(float inv_teams)
 void invasion_DelayedInit(entity this) // Do this check with a delay so we can wait for teams to be set up.
 {
 	if(autocvar_g_invasion_teams)
+	{
 		invasion_teams = bound(2, autocvar_g_invasion_teams, 4);
+		int teams = 0;
+		if(invasion_teams >= 1) teams |= BIT(0);
+		if(invasion_teams >= 2) teams |= BIT(1);
+		if(invasion_teams >= 3) teams |= BIT(2);
+		if(invasion_teams >= 4) teams |= BIT(3);
+
+		invasion_teams = teams; // now set it?
+	}
 	else
 		invasion_teams = 0;
 
@@ -540,7 +542,7 @@ void invasion_Initialize()
 		}
 	}
 
-	InitializeEntity(world, invasion_DelayedInit, INITPRIO_GAMETYPE);
+	InitializeEntity(NULL, invasion_DelayedInit, INITPRIO_GAMETYPE);
 }
 
 #endif