From: Mario <mario.mario@y7mail.com>
Date: Tue, 13 Aug 2013 05:35:41 +0000 (+1000)
Subject: Fix bots attacking the wrong base in reverse mode
X-Git-Tag: xonotic-v0.8.1~29^2~51
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9dd0f05705646e97c4fecd5cfbebee73de338d9a;p=xonotic%2Fxonotic-data.pk3dir.git

Fix bots attacking the wrong base in reverse mode
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 167de84dc..a915b2def 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -1128,7 +1128,7 @@ entity havocbot_ctf_find_flag(entity bot)
 	f = ctf_worldflaglist;
 	while (f)
 	{
-		if (bot.team == f.team)
+		if (!ctf_IsDifferentTeam(bot, f))
 			return f;
 		f = f.ctf_worldflagnext;
 	}
@@ -1141,7 +1141,7 @@ entity havocbot_ctf_find_enemy_flag(entity bot)
 	f = ctf_worldflaglist;
 	while (f)
 	{
-		if (bot.team != f.team)
+		if (ctf_IsDifferentTeam(bot, f))
 			return f;
 		f = f.ctf_worldflagnext;
 	}
@@ -1174,7 +1174,7 @@ void havocbot_goalrating_ctf_ourflag(float ratingscale)
 	head = ctf_worldflaglist;
 	while (head)
 	{
-		if (self.team == head.team)
+		if (!ctf_IsDifferentTeam(self, head))
 			break;
 		head = head.ctf_worldflagnext;
 	}
@@ -1188,7 +1188,7 @@ void havocbot_goalrating_ctf_ourbase(float ratingscale)
 	head = ctf_worldflaglist;
 	while (head)
 	{
-		if (self.team == head.team)
+		if (!ctf_IsDifferentTeam(self, head))
 			break;
 		head = head.ctf_worldflagnext;
 	}
@@ -1204,7 +1204,7 @@ void havocbot_goalrating_ctf_enemyflag(float ratingscale)
 	head = ctf_worldflaglist;
 	while (head)
 	{
-		if (self.team != head.team)
+		if (ctf_IsDifferentTeam(self, head))
 			break;
 		head = head.ctf_worldflagnext;
 	}