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

diff --cc qcsrc/server/bot/havocbot/havocbot.qc
index 7a3ac0561af3c6ec66917479cad1b6a2ab1756de,08b821aba82724a7392323a35ac1e17fd24b930e..629009761fbcece18ce7d57a4f2094d6ef842eef
--- 1/qcsrc/server/bot/havocbot/havocbot.qc
--- 2/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))
        {

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/g_damage.qc
Simple merge