Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

diff --combined qcsrc/common/wepent.qc
index 07511e0be2699868f87baa042f4839d223fc3fe7,e8afba86405e82abc48bde9746ce6ed4ea21af46..be3d089bd3d63c779df0b9d7a492f0226c1d68d4
--- 1/qcsrc/common/wepent.qc
--- 2/qcsrc/common/wepent.qc
+++ b/qcsrc/common/wepent.qc
@@@ -26,10 -26,6 +26,10 @@@ MACRO_EN
        { WriteByte(chan, this.vortex_charge * 16); }, \
        { (viewmodels[this.m_wepent_slot]).vortex_charge = ReadByte() / 16; }) \
      \
 +    PROP(false, oknex_charge, WEPENT_SET_NORMAL, \
 +      { WriteByte(chan, this.oknex_charge * 16); }, \
 +      { (viewmodels[this.m_wepent_slot]).oknex_charge = ReadByte() / 16; }) \
 +    \
      PROP(false, m_gunalign, WEPENT_SET_NORMAL, \
        { WriteByte(chan, this.m_gunalign); }, \
        { (viewmodels[this.m_wepent_slot]).m_gunalign = ReadByte(); }) \
@@@ -61,10 -57,6 +61,10 @@@
      PROP(false, vortex_chargepool_ammo, WEPENT_SET_NORMAL, \
        { WriteByte(chan, this.vortex_chargepool_ammo * 16); }, \
        { (viewmodels[this.m_wepent_slot]).vortex_chargepool_ammo = ReadByte() / 16; }) \
 +    \
 +      PROP(false, oknex_chargepool_ammo, WEPENT_SET_NORMAL, \
 +      { WriteByte(chan, this.oknex_chargepool_ammo * 16); }, \
 +      { (viewmodels[this.m_wepent_slot]).oknex_chargepool_ammo = ReadByte() / 16; }) \
      \
      PROP(false, clip_load, WEPENT_SET_NORMAL, \
        { WriteShort(chan, this.clip_load); }, \
@@@ -90,7 -82,7 +90,7 @@@
                }
                WEPENT_NETPROPS(X);
        #undef X
-               if (i >= BITS(16 - 1)) LOG_FATAL("Exceeded WEPENT_NETPROPS limit");
+               if (i >= BITS(24 - 1)) LOG_FATAL("Exceeded WEPENT_NETPROPS limit");
        }
  
        bool _wepent_send(entity this, entity to, int sf, int chan)
@@@ -103,7 -95,7 +103,7 @@@
                        WriteHeader(chan, CLIENT_WEPENT);
                .entity weaponentity = this.owner.weaponentity_fld;
                WriteByte(chan, weaponslot(weaponentity));
-               WriteShort(chan, sf);
+               WriteInt24_t(chan, sf);
                int i = 0;
                #define X(public, fld, set, sv, cl) { \
                        if (sf & BIT(i)) { \
@@@ -172,7 -164,7 +172,7 @@@
                int slot = ReadByte();
                this.m_wepent_slot = slot;
                viewmodels[slot].m_wepent_slot = slot;
-               int sf = ReadShort();
+               int sf = ReadInt24_t();
                int i = 0;
                #define X(public, fld, set, sv, cl) { \
                        if (sf & BIT(i)) { \