X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fhavocbot%2Froles.qc;h=45f5a6e692c4bbc0cda20f2a1d99a10caa0f805c;hb=b8bf0a16d1c441ae346e4cefcbe80ae4f2937f85;hp=17b80224d5ed98f5f8b3c4c6245cc405418b0057;hpb=e14bb786305e05541496fb5b28c090e0ff1b5783;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/bot/havocbot/roles.qc b/qcsrc/server/bot/havocbot/roles.qc
index 17b80224d..45f5a6e69 100644
--- a/qcsrc/server/bot/havocbot/roles.qc
+++ b/qcsrc/server/bot/havocbot/roles.qc
@@ -85,8 +85,8 @@ void havocbot_goalrating_items(float ratingscale, vector org, float sradius)
 					if( head.armorvalue && player.armorvalue > self.armorvalue)
 						continue;
 
-					if( !WEPSET_EMPTY_E(head) )
-					if( !WEPSET_CONTAINS_ALL_EE(player, head) )
+					if( head.weapons )
+					if( head.weapons & ~player.weapons )
 						continue;
 
 					if (head.ammo_shells && player.ammo_shells > self.ammo_shells)
@@ -175,11 +175,11 @@ void havocbot_goalrating_enemyplayers(float ratingscale, vector org, float sradi
 				continue;
 			*/
 
-			if(head.flags & FL_INWATER || head.flags & FL_PARTIALGROUND)
+			if((head.flags & FL_INWATER) || (head.flags & FL_PARTIALGROUND))
 				continue;
 
 			// not falling
-			if(head.flags & FL_ONGROUND == 0)
+			if((head.flags & FL_ONGROUND) == 0)
 			{
 				traceline(head.origin, head.origin + '0 0 -1500', TRUE, world);
 				t = pointcontents(trace_endpos + '0 0 1');
@@ -269,7 +269,7 @@ void havocbot_chooserole()
 {
 	dprint("choosing a role...\n");
 	self.bot_strategytime = 0;
-	if (MUTATOR_CALLHOOK(HavocBot_ChooseRule))
+	if (MUTATOR_CALLHOOK(HavocBot_ChooseRole))
 		return;
 	else if (g_keyhunt)
 		havocbot_chooserole_kh();