From: Mario Date: Fri, 16 Feb 2018 11:01:25 +0000 (+1000) Subject: Use a 24 bit sendflag to allow more wepent props X-Git-Tag: xonotic-v0.8.5~2312 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=923cc08b9c0aa6215e6e60eb9ead2af163a765bf;p=xonotic%2Fxonotic-data.pk3dir.git Use a 24 bit sendflag to allow more wepent props --- diff --git a/qcsrc/common/wepent.qc b/qcsrc/common/wepent.qc index 9335a4788..e8afba864 100644 --- a/qcsrc/common/wepent.qc +++ b/qcsrc/common/wepent.qc @@ -82,7 +82,7 @@ MACRO_END } 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) @@ -95,7 +95,7 @@ MACRO_END 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)) { \ @@ -164,7 +164,7 @@ MACRO_END 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)) { \