Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Tue, 27 Dec 2016 12:44:01 +0000 (22:44 +1000)
committerMario <mario@smbclan.net>
Tue, 27 Dec 2016 12:44:01 +0000 (22:44 +1000)
# Conflicts:
# qcsrc/server/weapons/weaponsystem.qc

1  2 
qcsrc/common/t_items.qc
qcsrc/server/weapons/weaponsystem.qc

Simple merge
@@@ -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;
        }