From: Mario <mario@smbclan.net>
Date: Wed, 5 Oct 2016 09:16:34 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~59
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a3d9634886e52c442bd9d68a86b8df77e6ed26ed;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
#	qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
#	qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
---

a3d9634886e52c442bd9d68a86b8df77e6ed26ed
diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index caabb2823,572261528..7201aaa0d
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.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));