Merge branch 'master' into terencehill/bot_fixes
authorterencehill <piuntn@gmail.com>
Sat, 22 Aug 2015 11:29:04 +0000 (13:29 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 22 Aug 2015 11:29:04 +0000 (13:29 +0200)
1  2 
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/cl_client.qc
qcsrc/server/g_damage.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
Simple merge
Simple merge