X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fbot.qc;h=40b769ddd3fb4a78f3b156995a2cf53153800869;hp=b45f35aa8fffb0d80b2e1b700f6636f7153e25ef;hb=b0a06888ff894f9d334f6277b996f98ae8a665a0;hpb=8c8a22011714768f8c5b3ac887d0fd099fc08d8b

diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc
index b45f35aa8..40b769ddd 100644
--- a/qcsrc/server/bot/bot.qc
+++ b/qcsrc/server/bot/bot.qc
@@ -32,7 +32,7 @@ void bot_think()
 	if (self.bot_nextthink > time)
 		return;
 
-	self.flags &~= FL_GODMODE;
+	self.flags &= ~FL_GODMODE;
 	if(autocvar_bot_god)
 		self.flags |= FL_GODMODE;
 
@@ -43,7 +43,7 @@ void bot_think()
 	//self.bot_painintensity = self.bot_painintensity + self.bot_oldhealth - self.health;
 	//self.bot_painintensity = bound(0, self.bot_painintensity, 100);
 
-	if (autocvar_g_campaign && !campaign_bots_may_start)
+	if (!IS_PLAYER(self) || (autocvar_g_campaign && !campaign_bots_may_start))
 	{
 		self.bot_nextthink = time + 0.5;
 		return;
@@ -363,7 +363,7 @@ void bot_relinkplayerlist()
 
 void bot_clientdisconnect()
 {
-	if not(IS_BOT_CLIENT(self))
+	if (!IS_BOT_CLIENT(self))
 		return;
 	bot_clearqueue(self);
 	if(self.cleanname)
@@ -386,7 +386,7 @@ void bot_clientdisconnect()
 
 void bot_clientconnect()
 {
-	if not(IS_BOT_CLIENT(self))
+	if (!IS_BOT_CLIENT(self))
 		return;
 	self.bot_preferredcolors = self.clientcolors;
 	self.bot_nextthink = time - random();
@@ -551,7 +551,7 @@ float bot_fixcount()
 
 	FOR_EACH_REALCLIENT(head)
 	{
-		if(IS_PLAYER(head) || g_lms || g_arena || head.caplayer == 1)
+		if(IS_PLAYER(head) || g_lms || head.caplayer == 1)
 			++activerealplayers;
 		++realplayers;
 	}