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

diff --git a/qcsrc/server/bot/havocbot/roles.qc b/qcsrc/server/bot/havocbot/roles.qc
index 17b80224d..f682b6926 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)
@@ -98,7 +98,10 @@ void havocbot_goalrating_items(float ratingscale, vector org, float sradius)
 					if (head.ammo_rockets && player.ammo_rockets > self.ammo_rockets)
 						continue;
 
-					if (head.ammo_cells && player.ammo_cells > self.ammo_cells )
+					if (head.ammo_cells && player.ammo_cells > self.ammo_cells)
+						continue;
+
+					if (head.ammo_plasma && player.ammo_plasma > self.ammo_plasma)
 						continue;
 
 					discard = FALSE;
@@ -175,11 +178,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 +272,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();