Merge branch 'master' into martin-t/globals

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / wepent.qc

diff --git a/qcsrc/common/wepent.qc b/qcsrc/common/wepent.qc
index 07511e0be2699868f87baa042f4839d223fc3fe7..6b1797c664e9b38fa36f7eee6d6526d2eea4cd5c 100644 (file)
--- a/qcsrc/common/wepent.qc
+++ b/qcsrc/common/wepent.qc
@@ -20,11 +20,11 @@ MACRO_END
     \
     PROP(false, m_alpha, WEPENT_SET_NORMAL, \
        { WriteByte(chan, rint(bound(-1, 254 * this.m_alpha, 254) - -1)); }, \
-       { (viewmodels[this.m_wepent_slot]).alpha = (ReadByte() + -1) / 254; }) \
+       { (viewmodels[this.m_wepent_slot]).m_alpha = (ReadByte() + -1) / 254; }) \
     \
     PROP(false, vortex_charge, WEPENT_SET_NORMAL, \
-       { WriteByte(chan, this.vortex_charge * 16); }, \
-       { (viewmodels[this.m_wepent_slot]).vortex_charge = ReadByte() / 16; }) \
+       { WriteByte(chan, this.vortex_charge * 255); }, \
+       { (viewmodels[this.m_wepent_slot]).vortex_charge = ReadByte() / 255; }) \
     \
     PROP(false, oknex_charge, WEPENT_SET_NORMAL, \
        { WriteByte(chan, this.oknex_charge * 16); }, \
@@ -55,8 +55,8 @@ MACRO_END
        { (viewmodels[this.m_wepent_slot]).minelayer_mines = ReadByte(); }) \
     \
     PROP(false, arc_heat_percent, WEPENT_SET_NORMAL, \
-       { WriteByte(chan, this.arc_heat_percent * 16); }, \
-       { (viewmodels[this.m_wepent_slot]).arc_heat_percent = ReadByte() / 16; }) \
+       { WriteByte(chan, this.arc_heat_percent * 255); }, \
+       { (viewmodels[this.m_wepent_slot]).arc_heat_percent = ReadByte() / 255; }) \
     \
     PROP(false, vortex_chargepool_ammo, WEPENT_SET_NORMAL, \
        { WriteByte(chan, this.vortex_chargepool_ammo * 16); }, \
@@ -66,7 +66,7 @@ MACRO_END
        { WriteByte(chan, this.oknex_chargepool_ammo * 16); }, \
        { (viewmodels[this.m_wepent_slot]).oknex_chargepool_ammo = ReadByte() / 16; }) \
     \
-    PROP(false, clip_load, WEPENT_SET_NORMAL, \
+       PROP(false, clip_load, WEPENT_SET_NORMAL, \
        { WriteShort(chan, this.clip_load); }, \
        { (viewmodels[this.m_wepent_slot]).clip_load = ReadShort(); }) \
     \
@@ -90,7 +90,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)
@@ -103,7 +103,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)) { \
@@ -172,7 +172,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)) { \