X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fbot.qc;h=468b32c4a57ef46fd2eb6186901475b5aae946fa;hb=0366770c97e88ade7118695647279773a8548b8f;hp=c033daeecebead6955d18eabdddb2ae2b108e7a9;hpb=70b84d37e2cf1d5336c327cb43593024de2a2c6c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc
index c033daeec..468b32c4a 100644
--- a/qcsrc/server/bot/bot.qc
+++ b/qcsrc/server/bot/bot.qc
@@ -1,5 +1,4 @@
 #include "bot.qh"
-#include "../_all.qh"
 
 #include "aim.qh"
 #include "navigation.qh"
@@ -9,6 +8,8 @@
 #include "havocbot/havocbot.qh"
 #include "havocbot/scripting.qh"
 
+#include "../teamplay.qh"
+
 #include "../antilag.qh"
 #include "../autocvars.qh"
 #include "../campaign.qh"
@@ -16,23 +17,23 @@
 #include "../constants.qh"
 #include "../defs.qh"
 #include "../race.qh"
-#include "../t_items.qh"
+#include <common/t_items.qh>
 
-#include "../mutators/mutators_include.qh"
+#include "../mutators/all.qh"
 
 #include "../weapons/accuracy.qh"
 
-#include "../../common/constants.qh"
-#include "../../common/mapinfo.qh"
-#include "../../common/teams.qh"
-#include "../../common/util.qh"
+#include <common/constants.qh>
+#include <common/mapinfo.qh>
+#include <common/teams.qh>
+#include <common/util.qh>
 
-#include "../../common/weapons/all.qh"
+#include <common/weapons/all.qh>
 
-#include "../../csqcmodellib/sv_model.qh"
+#include <lib/csqcmodel/sv_model.qh>
 
-#include "../../warpzonelib/common.qh"
-#include "../../warpzonelib/util_server.qh"
+#include <lib/warpzone/common.qh>
+#include <lib/warpzone/util_server.qh>
 
 entity bot_spawn()
 {SELFPARAM();
@@ -112,7 +113,7 @@ void bot_think()
 	}
 
 	// if dead, just wait until we can respawn
-	if (self.deadflag)
+	if (IS_DEAD(self))
 	{
 		if (self.deadflag == DEAD_DEAD)
 		{
@@ -131,7 +132,6 @@ void bot_setnameandstuff()
 {SELFPARAM();
 	string readfile, s;
 	float file, tokens, prio;
-	entity p;
 
 	string bot_name, bot_model, bot_skin, bot_shirt, bot_pants;
 	string name, prefix, suffix;
@@ -168,15 +168,13 @@ void bot_setnameandstuff()
 				continue;
 			s = argv(0);
 			prio = 1;
-			FOR_EACH_CLIENT(p)
-			{
-				if(IS_BOT_CLIENT(p))
-				if(s == p.cleanname)
+			FOREACH_CLIENT(IS_BOT_CLIENT(it), LAMBDA(
+				if(s == it.cleanname)
 				{
 					prio = 0;
 					break;
 				}
-			}
+			));
 			RandomSelection_Add(world, 0, readfile, 1, prio);
 		}
 		readfile = RandomSelection_chosen_string;
@@ -236,16 +234,13 @@ void bot_setnameandstuff()
 		name = bot_name;
 
 	// number bots with identical names
-	float i;
-	i = 0;
-	FOR_EACH_CLIENT(p)
-	{
-		if(IS_BOT_CLIENT(p))
-			if(p.cleanname == name)
-				++i;
-	}
-	if (i)
-		self.netname = self.netname_freeme = strzone(strcat(prefix, name, "(", ftos(i), ")", suffix));
+	int j = 0;
+	FOREACH_CLIENT(IS_BOT_CLIENT(it), LAMBDA(
+		if(it.cleanname == name)
+			++j;
+	));
+	if (j)
+		self.netname = self.netname_freeme = strzone(strcat(prefix, name, "(", ftos(j), ")", suffix));
 	else
 		self.netname = self.netname_freeme = strzone(strcat(prefix, name, suffix));
 
@@ -406,10 +401,9 @@ void bot_clientdisconnect()
 		bot_waypoint_queue_owner = world;
 }
 
-void bot_clientconnect()
-{SELFPARAM();
-	if (!IS_BOT_CLIENT(self))
-		return;
+void bot_clientconnect(entity this)
+{
+	if (!IS_BOT_CLIENT(this)) return;
 	self.bot_preferredcolors = self.clientcolors;
 	self.bot_nextthink = time - random();
 	self.lag_func = bot_lagfunc;
@@ -507,17 +501,15 @@ void autoskill(float factor)
 {
 	float bestbot;
 	float bestplayer;
-	entity head;
 
 	bestbot = -1;
 	bestplayer = -1;
-	FOR_EACH_PLAYER(head)
-	{
-		if(IS_REAL_CLIENT(head))
-			bestplayer = max(bestplayer, head.totalfrags - head.totalfrags_lastcheck);
+	FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(
+		if(IS_REAL_CLIENT(it))
+			bestplayer = max(bestplayer, it.totalfrags - it.totalfrags_lastcheck);
 		else
-			bestbot = max(bestbot, head.totalfrags - head.totalfrags_lastcheck);
-	}
+			bestbot = max(bestbot, it.totalfrags - it.totalfrags_lastcheck);
+	));
 
 	LOG_TRACE("autoskill: best player got ", ftos(bestplayer), ", ");
 	LOG_TRACE("best bot got ", ftos(bestbot), "; ");
@@ -551,11 +543,10 @@ void autoskill(float factor)
 		// don't reset counters, wait for them to accumulate
 	}
 
-	FOR_EACH_PLAYER(head)
-		head.totalfrags_lastcheck = head.totalfrags;
+	FOREACH_CLIENT(IS_PLAYER(it), LAMBDA(it.totalfrags_lastcheck = it.totalfrags));
 }
 
-void bot_calculate_stepheightvec(void)
+void bot_calculate_stepheightvec()
 {
 	stepheightvec = autocvar_sv_stepheight * '0 0 1';
 	jumpstepheightvec = stepheightvec +
@@ -565,19 +556,20 @@ void bot_calculate_stepheightvec(void)
 
 float bot_fixcount()
 {
-	entity head;
-	float realplayers, bots, activerealplayers;
-
-	activerealplayers = 0;
-	realplayers = 0;
-
-	FOR_EACH_REALCLIENT(head)
-	{
-		if(IS_PLAYER(head) || g_lms || head.caplayer == 1)
-			++activerealplayers;
-		++realplayers;
-	}
-
+	int activerealplayers = 0;
+	int realplayers = 0;
+	if (MUTATOR_CALLHOOK(Bot_FixCount, activerealplayers, realplayers)) {
+		activerealplayers = bot_activerealplayers;
+		realplayers = bot_realplayers;
+	} else {
+		FOREACH_CLIENT(IS_REAL_CLIENT(it), LAMBDA(
+			if(IS_PLAYER(it))
+				++activerealplayers;
+			++realplayers;
+		));
+	}
+
+	int bots;
 	// add/remove bots if needed to make sure there are at least
 	// minplayers+bot_number, or remove all bots if no one is playing
 	// But don't remove bots immediately on level change, as the real players