From: terencehill <piuntn@gmail.com>
Date: Sun, 29 Apr 2018 09:05:12 +0000 (+0200)
Subject: Bot AI: fix item rating when havocbot_goalrating_items is called multiple times ... 
X-Git-Tag: xonotic-v0.8.5~1923^2~58
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=31f11a1e1ea0662e7f1a0a2c3e1c19e9d4daa6ba;p=xonotic%2Fxonotic-data.pk3dir.git

Bot AI: fix item rating when havocbot_goalrating_items is called multiple times (some CTF roles)
---

diff --git a/qcsrc/server/bot/default/havocbot/roles.qc b/qcsrc/server/bot/default/havocbot/roles.qc
index 42106588c..bf45cd6cd 100644
--- a/qcsrc/server/bot/default/havocbot/roles.qc
+++ b/qcsrc/server/bot/default/havocbot/roles.qc
@@ -120,8 +120,6 @@ void havocbot_goalrating_items(entity this, float ratingscale, vector org, float
 		// NOTE: this code assumes each bot rates items in a different frame
 		if(it.bot_ratingscale_time == time && ratingscale < it.bot_ratingscale)
 			continue;
-		it.bot_ratingscale_time = time;
-		it.bot_ratingscale = ratingscale;
 
 		if(!it.solid)
 		{
@@ -174,6 +172,8 @@ void havocbot_goalrating_items(entity this, float ratingscale, vector org, float
 		if(!havocbot_goalrating_item_pickable_check_players(this, org, it, o))
 			continue;
 
+		it.bot_ratingscale_time = time;
+		it.bot_ratingscale = ratingscale;
 		rating = it.bot_pickupevalfunc(this, it);
 		if(rating > 0)
 			navigation_routerating(this, it, rating * ratingscale, 2000);