From: Mario Date: Tue, 27 Dec 2016 12:44:01 +0000 (+1000) Subject: Merge branch 'master' into Mario/wepent_experimental X-Git-Tag: xonotic-v0.8.2~326^2~9 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=468b023e4b41cbd40bae363aa136b102a63fc811;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/wepent_experimental # Conflicts: # qcsrc/server/weapons/weaponsystem.qc --- 468b023e4b41cbd40bae363aa136b102a63fc811 diff --cc qcsrc/server/weapons/weaponsystem.qc index 93d2af55b,ad479824e..2e0ee09bf --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@@ -449,13 -441,12 +449,12 @@@ void W_WeaponFrame(Player actor, .entit } } - if (PS(actor).m_switchweapon == WEP_Null) + if (this.m_switchweapon == WEP_Null) { - PS(actor).m_weapon = WEP_Null; - PS(actor).m_switchingweapon = WEP_Null; + this.m_weapon = WEP_Null; + this.m_switchingweapon = WEP_Null; this.state = WS_CLEAR; - actor.weaponname = ""; + this.weaponname = ""; - // actor.items &= ~IT_AMMO; return; }