From: Mario <zacjardine@y7mail.com>
Date: Sat, 3 Oct 2015 06:52:42 +0000 (+0000)
Subject: Merge branch 'terencehill/bot_fixes' into 'master'
X-Git-Tag: xonotic-v0.8.2~1891
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5607e279fe7b0dc9f92e15556ed6dc33f17f549c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/bot_fixes' into 'master'

Bot fixes

* Make misc_breakablemodel entities secondary target for bots so they never prefer shooting at barrels over players
* While shooting at breakable objects, don't focus on them, be ready to choose another enemy
* Properly set bot_attack field in a few more situations (reset bot_attack field when going observer, and set/reset it properly when freezing/unfreezing somebody)

See merge request !197
---

5607e279fe7b0dc9f92e15556ed6dc33f17f549c
diff --cc qcsrc/server/bot/havocbot/havocbot.qc
index 7a3ac0561,08b821aba..629009761
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@@ -854,9 -854,9 +854,9 @@@ void havocbot_movetogoal(
  }
  
  void havocbot_chooseenemy()
 -{
 +{SELFPARAM();
  	entity head, best, head2;
- 	float rating, bestrating, i, hf;
+ 	float rating, bestrating, hf;
  	vector eye, v;
  	if (autocvar_bot_nofire || IS_INDEPENDENT_PLAYER(self))
  	{