Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Wed, 5 Oct 2016 09:16:34 +0000 (19:16 +1000)
committerMario <mario@smbclan.net>
Wed, 5 Oct 2016 09:16:34 +0000 (19:16 +1000)
# Conflicts:
# qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
# qcsrc/common/mutators/mutator/overkill/sv_overkill.qc

1  2 
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
qcsrc/common/weapons/weapon/devastator.qc
qcsrc/common/weapons/weapon/hook.qc

@@@ -285,7 -353,16 +285,7 @@@ MUTATOR_HOOKFUNCTION(ok, FilterItem
        return true;
  }
  
- MUTATOR_HOOKFUNCTION(ok, SetStartItems)
 -MUTATOR_HOOKFUNCTION(ok, SpectateCopy)
 -{
 -      entity spectatee = M_ARGV(0, entity);
 -      entity client = M_ARGV(1, entity);
 -
 -      client.ammo_charge[PS(client).m_weapon.m_id] = spectatee.ammo_charge[PS(spectatee).m_weapon.m_id];
 -      client.ok_use_ammocharge = spectatee.ok_use_ammocharge;
 -}
 -
+ MUTATOR_HOOKFUNCTION(ok, SetStartItems, CBC_ORDER_LAST)
  {
        WepSet ok_start_items = (WEPSET(MACHINEGUN) | WEPSET(VORTEX) | WEPSET(SHOTGUN));
  
Simple merge