From: Mario <zacjardine@y7mail.com>
Date: Thu, 13 Nov 2014 15:02:50 +0000 (+1100)
Subject: Merge branch 'master' into Mario/domination_roundbased
X-Git-Tag: xonotic-v0.8.0~160^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9138acec2282209ac6867c5a34365cff3fb8fa64;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/domination_roundbased

Conflicts:
	qcsrc/common/constants.qh
---

9138acec2282209ac6867c5a34365cff3fb8fa64
diff --cc qcsrc/server/mutators/gamemode_domination.qc
index 07f1b805b,a6d737205..2569a49d3
--- a/qcsrc/server/mutators/gamemode_domination.qc
+++ b/qcsrc/server/mutators/gamemode_domination.qc
@@@ -632,11 -492,8 +632,11 @@@ void dom_Initialize(
  
  MUTATOR_DEFINITION(gamemode_domination)
  {
 +	MUTATOR_HOOK(GetTeamCount, dom_GetTeamCount, CBC_ORDER_ANY);
 +	MUTATOR_HOOK(reset_map_players, dom_ResetMap, CBC_ORDER_ANY);
 +	MUTATOR_HOOK(PlayerSpawn, dom_PlayerSpawn, CBC_ORDER_ANY);
  	MUTATOR_HOOK(ClientConnect, dom_ClientConnect, CBC_ORDER_ANY);
- 	MUTATOR_HOOK(HavocBot_ChooseRule, dom_BotRoles, CBC_ORDER_ANY);
+ 	MUTATOR_HOOK(HavocBot_ChooseRole, dom_BotRoles, CBC_ORDER_ANY);
  
  	MUTATOR_ONADD
  	{