Merge remote branch 'origin/pooga/keepawaybots'

Conflicts:
	qcsrc/server/bot/aim.qc

diff --cc qcsrc/server/bot/aim.qc
index 9300ac721d889366a386bc8b0a06fb0656ad1443,5277b400b92dc5dcca610f45f6b61d3ff966bb41..63e971b17da9c52cacc638e8ae6c3f006cff096f
--- 1/qcsrc/server/bot/aim.qc
--- 2/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(teams_matter)
+       // 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(teamplay)
        {
                if(e.team==0)
                        return FALSE;

diff --cc qcsrc/server/bot/havocbot/roles.qc
Simple merge

diff --cc qcsrc/server/mutators/gamemode_keepaway.qc
Simple merge