Merge branch 'master' into Mario/domination_roundbased
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 15:02:50 +0000 (02:02 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 15:02:50 +0000 (02:02 +1100)
Conflicts:
qcsrc/common/constants.qh

1  2 
gamemodes.cfg
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_domination.qc
qcsrc/server/teamplay.qc

diff --cc gamemodes.cfg
Simple merge
Simple merge
Simple merge
@@@ -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
        {
Simple merge