X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fbot.qc;h=d4737dba367b90926737177925accce73e62f245;hb=845401fd312c66c059aaee1772ac5d79555ab4fc;hp=b93d87ad29f229736686045c546f26d0af1101a6;hpb=451c0fbf5473c6acc88bafaa0e9c14e5afd3764e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc
index b93d87ad2..d4737dba3 100644
--- a/qcsrc/server/bot/bot.qc
+++ b/qcsrc/server/bot/bot.qc
@@ -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;
@@ -53,7 +53,7 @@ void bot_think()
 	{
 		self.v_angle = self.angles;
 		self.v_angle_z = 0;
-		self.fixangle = FALSE;
+		self.fixangle = false;
 	}
 
 	self.dmg_take = 0;
@@ -201,7 +201,7 @@ void bot_setnameandstuff()
 	READSKILL(bot_thinkskill, 1, 0.5); // think skill
 	READSKILL(bot_aiskill, 2, 0); // "ai" skill
 
-	self.bot_config_loaded = TRUE;
+	self.bot_config_loaded = true;
 
 	// this is really only a default, JoinBestTeam is called later
 	setcolor(self, stof(bot_shirt) * 16 + stof(bot_pants));
@@ -243,7 +243,7 @@ void bot_custom_weapon_priority_setup()
 {
 	float tokens, i, c, w;
 
-	bot_custom_weapon = FALSE;
+	bot_custom_weapon = false;
 
 	if(	autocvar_bot_ai_custom_weapon_priority_far == "" ||
 		autocvar_bot_ai_custom_weapon_priority_mid == "" ||
@@ -313,7 +313,7 @@ void bot_custom_weapon_priority_setup()
 	if(c < WEP_COUNT)
 		bot_weapons_close[c] = -1;
 
-	bot_custom_weapon = TRUE;
+	bot_custom_weapon = true;
 }
 
 void bot_endgame()
@@ -358,7 +358,7 @@ void bot_relinkplayerlist()
 	}
 	dprint(strcat("relink: ", ftos(currentbots), " bots seen.\n"));
 	bot_strategytoken = bot_list;
-	bot_strategytoken_taken = TRUE;
+	bot_strategytoken_taken = true;
 }
 
 void bot_clientdisconnect()
@@ -391,7 +391,7 @@ void bot_clientconnect()
 	self.bot_preferredcolors = self.clientcolors;
 	self.bot_nextthink = time - random();
 	self.lag_func = bot_lagfunc;
-	self.isbot = TRUE;
+	self.isbot = true;
 	self.createdtime = self.bot_nextthink;
 
 	if(!self.bot_config_loaded) // This is needed so team overrider doesn't break between matches
@@ -406,7 +406,7 @@ void bot_clientconnect()
 	else if(self.bot_forced_team==4)
 		self.team = NUM_TEAM_4;
 	else
-		JoinBestTeam(self, FALSE, TRUE);
+		JoinBestTeam(self, false, true);
 
 	havocbot_setupbot();
 }
@@ -417,7 +417,7 @@ void bot_removefromlargestteam()
 	entity best, head;
 	CheckAllowedTeams(world);
 	GetTeamCounts(world);
-	head = findchainfloat(isbot, TRUE);
+	head = findchainfloat(isbot, true);
 	if (!head)
 		return;
 	best = head;
@@ -463,7 +463,7 @@ void bot_removenewest()
 		return;
 	}
 
-	head = findchainfloat(isbot, TRUE);
+	head = findchainfloat(isbot, true);
 	if (!head)
 		return;
 	best = head;
@@ -560,7 +560,7 @@ float bot_fixcount()
 	// 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
 	// usually haven't rejoined yet
-	bots_would_leave = FALSE;
+	bots_would_leave = false;
 	if (teamplay && autocvar_bot_vs_human && (c3==-1 && c4==-1))
 		bots = min(ceil(fabs(autocvar_bot_vs_human) * activerealplayers), maxclients - realplayers);
 	else if ((realplayers || autocvar_bot_join_empty || (currentbots > 0 && time < 5)))
@@ -575,7 +575,7 @@ float bot_fixcount()
 
 		bots = min(max(minbots, minplayers - activerealplayers), maxclients - realplayers);
 		if(bots > minbots)
-			bots_would_leave = TRUE;
+			bots_would_leave = true;
 	}
 	else
 	{
@@ -592,14 +592,14 @@ float bot_fixcount()
 			if (bot_spawn() == world)
 			{
 				bprint("Can not add bot, server full.\n");
-				return FALSE;
+				return false;
 			}
 		}
 		while (currentbots > bots)
 			bot_removenewest();
 	}
 
-	return TRUE;
+	return true;
 }
 
 void bot_serverframe()
@@ -654,7 +654,7 @@ void bot_serverframe()
 	}
 	else
 	{
-		botframe_spawnedwaypoints = TRUE;
+		botframe_spawnedwaypoints = true;
 		waypoint_loadall();
 		if(!waypoint_load_links())
 			waypoint_schedulerelinkall();
@@ -667,7 +667,7 @@ void bot_serverframe()
 		//  frame, which causes choppy framerates)
 		if (bot_strategytoken_taken)
 		{
-			bot_strategytoken_taken = FALSE;
+			bot_strategytoken_taken = false;
 			if (bot_strategytoken)
 				bot_strategytoken = bot_strategytoken.nextbot;
 			if (!bot_strategytoken)