X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator%2Fgamemode_keepaway.qc;h=badae12c2d4897090aaec805bc594d4f1cc9de76;hb=4299b97f93fc4753665e198066970bd51bb3b06a;hp=7b33bea6f374dd585755e6a31f572830b514b73d;hpb=04692f3bf447ec38a1bbb0a330c288bbe7a42726;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator/gamemode_keepaway.qc b/qcsrc/server/mutators/mutator/gamemode_keepaway.qc
index 7b33bea6f..badae12c2 100644
--- a/qcsrc/server/mutators/mutator/gamemode_keepaway.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_keepaway.qc
@@ -232,21 +232,21 @@ void havocbot_role_ka_carrier(entity this)
 	if (IS_DEAD(this))
 		return;
 
-	if (time > this.bot_strategytime)
+	if (navigation_goalrating_timeout(this))
 	{
-		this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
-
 		navigation_goalrating_start(this);
 		havocbot_goalrating_items(this, 10000, this.origin, 10000);
 		havocbot_goalrating_enemyplayers(this, 20000, this.origin, 10000);
 		havocbot_goalrating_waypoints(this, 1, this.origin, 3000);
 		navigation_goalrating_end(this);
+
+		navigation_goalrating_timeout_set(this);
 	}
 
 	if (!this.ballcarried)
 	{
 		this.havocbot_role = havocbot_role_ka_collector;
-		this.bot_strategytime = 0;
+		navigation_goalrating_timeout_expire(this, 2);
 	}
 }
 
@@ -255,21 +255,21 @@ void havocbot_role_ka_collector(entity this)
 	if (IS_DEAD(this))
 		return;
 
-	if (time > this.bot_strategytime)
+	if (navigation_goalrating_timeout(this))
 	{
-		this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
-
 		navigation_goalrating_start(this);
 		havocbot_goalrating_items(this, 10000, this.origin, 10000);
 		havocbot_goalrating_enemyplayers(this, 1000, this.origin, 10000);
 		havocbot_goalrating_ball(this, 20000, this.origin);
 		navigation_goalrating_end(this);
+
+		navigation_goalrating_timeout_set(this);
 	}
 
 	if (this.ballcarried)
 	{
 		this.havocbot_role = havocbot_role_ka_carrier;
-		this.bot_strategytime = 0;
+		navigation_goalrating_timeout_expire(this, 2);
 	}
 }