Merge branch 'master' into terencehill/bot_fixes

diff --cc qcsrc/server/bot/havocbot/havocbot.qc
index 4b690c6eae6b6ab1d1d08a0c1b6b52663f45ca67,fcf1c04d29cda938cd5f8e3454bf1fc2150a13e7..7b7c6474307a9c81db7cceaaa5eac771420db6c1
--- 1/qcsrc/server/bot/havocbot/havocbot.qc
--- 2/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@@ -950,9 -930,9 +950,9 @@@ void havocbot_chooseenemy(
  
                // I want to do a second scan if no enemy was found or I don't have weapons
                // TODO: Perform the scan when using the rifle (requires changes on the rifle code)
-               if(best || self.weapons) // || self.weapon == WEP_RIFLE
+               if(best || self.weapons) // || self.weapon == WEP_RIFLE.m_id
                        break;
 -              if(i)
 +              if(scan_transparent)
                        break;
  
                // Set flags to see through transparent objects

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

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