X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fbot%2Fhavocbot%2Froles.qc;h=17b80224d5ed98f5f8b3c4c6245cc405418b0057;hp=ad3bb2367418f611d13bb67725c70cd416d7831f;hb=c1fc567698f48fbfa3866c7a93406edad4823a1f;hpb=c5f3d8aee411e6f5a0f7b34937f2c7140aab1c6f

diff --git a/qcsrc/server/bot/havocbot/roles.qc b/qcsrc/server/bot/havocbot/roles.qc
index ad3bb2367..17b80224d 100644
--- a/qcsrc/server/bot/havocbot/roles.qc
+++ b/qcsrc/server/bot/havocbot/roles.qc
@@ -69,7 +69,7 @@ void havocbot_goalrating_items(float ratingscale, vector org, float sradius)
 
 				if ( player.team == self.team )
 				{
-					if ( clienttype(player) != CLIENTTYPE_REAL || discard )
+					if ( !IS_REAL_CLIENT(player) || discard )
 						continue;
 
 					if( d > friend_distance)
@@ -203,25 +203,6 @@ void havocbot_goalrating_enemyplayers(float ratingscale, vector org, float sradi
 // choose a role according to the situation
 void havocbot_role_dm();
 
-//DOM:
-//go to best items, or control points you don't own
-void havocbot_role_dom()
-{
-	if(self.deadflag != DEAD_NO)
-		return;
-
-	if (self.bot_strategytime < time)
-	{
-		self.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
-		navigation_goalrating_start();
-		havocbot_goalrating_controlpoints(10000, self.origin, 15000);
-		havocbot_goalrating_items(8000, self.origin, 8000);
-		//havocbot_goalrating_enemyplayers(3000, self.origin, 2000);
-		//havocbot_goalrating_waypoints(1, self.origin, 1000);
-		navigation_goalrating_end();
-	}
-}
-
 //DM:
 //go to best items
 void havocbot_role_dm()
@@ -284,27 +265,18 @@ void havocbot_chooserole_race()
 	self.havocbot_role = havocbot_role_race;
 }
 
-void havocbot_chooserole_dom()
-{
-	self.havocbot_role = havocbot_role_dom;
-}
-
 void havocbot_chooserole()
 {
 	dprint("choosing a role...\n");
 	self.bot_strategytime = 0;
 	if (MUTATOR_CALLHOOK(HavocBot_ChooseRule))
 		return;
-	else if (g_domination)
-		havocbot_chooserole_dom();
 	else if (g_keyhunt)
 		havocbot_chooserole_kh();
 	else if (g_race || g_cts)
 		havocbot_chooserole_race();
 	else if (g_onslaught)
 		havocbot_chooserole_ons();
-	else if (g_assault)
-		havocbot_chooserole_ast();
 	else // assume anything else is deathmatch
 		havocbot_chooserole_dm();
 }