From: terencehill <piuntn@gmail.com>
Date: Sat, 22 Aug 2015 11:29:04 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/bot_fixes
X-Git-Tag: xonotic-v0.8.2~1891^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=95c7f3405f82d9975617acc0ca4d4bcf5c4acba2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/bot_fixes
---

95c7f3405f82d9975617acc0ca4d4bcf5c4acba2
diff --cc qcsrc/server/bot/havocbot/havocbot.qc
index 4b690c6ea,fcf1c04d2..7b7c64743
--- a/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