From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 20 Jun 2011 08:17:40 +0000 (+0200)
Subject: Merge remote branch 'origin/pooga/keepawaybots'
X-Git-Tag: xonotic-v0.5.0~199^2~14^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1a507acfe146c88e76d252ddec4242210ac8923f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/pooga/keepawaybots'

Conflicts:
	qcsrc/server/bot/aim.qc
---

1a507acfe146c88e76d252ddec4242210ac8923f
diff --cc qcsrc/server/bot/aim.qc
index 9300ac721,5277b400b..63e971b17
--- a/qcsrc/server/bot/aim.qc
+++ b/qcsrc/server/bot/aim.qc
@@@ -113,7 -114,13 +114,13 @@@ float bot_shouldattack(entity e
  		if(e.freezetag_frozen)
  			return FALSE;
  
+ 	// If neither player has ball then don't attack unless the ball is on the
+ 	// ground.
+ 	if (g_keepaway)
+ 		if (!e.ballcarried && !self.ballcarried && ka_ball.owner)
+ 			return FALSE;
+ 
 -	if(teams_matter)
 +	if(teamplay)
  	{
  		if(e.team==0)
  			return FALSE;