From: Mario <mario.mario@y7mail.com>
Date: Wed, 4 Jun 2014 22:46:04 +0000 (+1000)
Subject: Merge branch 'master' into Mario/ctf_updates
X-Git-Tag: xonotic-v0.8.1~29^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=43f2705555176d1c352e94ace1b9ea4d24e15434;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/ctf_updates
---

43f2705555176d1c352e94ace1b9ea4d24e15434
diff --cc qcsrc/server/mutators/gamemode_ctf.qc
index aa7a81337,c9c9b4584..00bbb091a
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@@ -2516,9 -2182,7 +2516,9 @@@ MUTATOR_DEFINITION(gamemode_ctf
  	MUTATOR_HOOK(VehicleEnter, ctf_VehicleEnter, CBC_ORDER_ANY);
  	MUTATOR_HOOK(VehicleExit, ctf_VehicleExit, CBC_ORDER_ANY);
  	MUTATOR_HOOK(AbortSpeedrun, ctf_AbortSpeedrun, CBC_ORDER_ANY);
- 	MUTATOR_HOOK(HavocBot_ChooseRule, ctf_BotRoles, CBC_ORDER_ANY);
+ 	MUTATOR_HOOK(HavocBot_ChooseRole, ctf_BotRoles, CBC_ORDER_ANY);
 +	MUTATOR_HOOK(GetTeamCount, ctf_GetTeamCount, CBC_ORDER_ANY);
 +	MUTATOR_HOOK(SpectateCopy, ctf_SpectateCopy, CBC_ORDER_ANY);
  
  	MUTATOR_ONADD
  	{