Merge branch 'master' into Mario/race_target_waypoint

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

diff --git a/qcsrc/common/wepent.qc b/qcsrc/common/wepent.qc
index b9bcb737dae14e2c6cd31b311eca0e067531d1a2..8d74a7b3272ffc2da3ef3650fff42a223357cf16 100644 (file)
--- a/qcsrc/common/wepent.qc
+++ b/qcsrc/common/wepent.qc
@@ -4,12 +4,6 @@
        var = x; \
 MACRO_END
 
-/** the engine player name strings are mutable! */
-#define WEPENT_SET_MUTABLE_STRING(var, x) MACRO_BEGIN \
-       if (var) strunzone(var); \
-       var = strzone(x); \
-MACRO_END
-
 // #define PROP(public, fld, set, sv, cl)
 #define WEPENT_NETPROPS(PROP) PROP(false, sv_entnum, WEPENT_SET_NORMAL, {}, {}) /* sentinel */ \
        PROP(false, m_switchweapon, WEPENT_SET_NORMAL, \
@@ -25,8 +19,8 @@ MACRO_END
        { (viewmodels[this.m_wepent_slot]).activeweapon = Weapons_from(ReadByte()); }) \
     \
     PROP(false, m_alpha, WEPENT_SET_NORMAL, \
-       { WriteByte(chan, this.m_alpha * 16); }, \
-       { (viewmodels[this.m_wepent_slot]).alpha = ReadByte() / 16; }) \
+       { WriteByte(chan, rint(bound(-1, 254 * this.m_alpha, 254) - -1)); }, \
+       { (viewmodels[this.m_wepent_slot]).alpha = (ReadByte() + -1) / 254; }) \
     \
     PROP(false, vortex_charge, WEPENT_SET_NORMAL, \
        { WriteByte(chan, this.vortex_charge * 16); }, \
@@ -119,12 +113,21 @@ MACRO_END
        #undef X
        }
 
+       bool wepent_customize(entity this, entity client)
+       {
+               //entity e = WaypointSprite_getviewentity(client);
+               .entity weaponentity = this.owner.weaponentity_fld;
+               return client.(weaponentity) == this.owner;
+       }
+
        void wepent_link(entity wep)
        {
                entity e = new(wepent_sender);
                e.owner = wep;
                setthink(e, wepent_think);
                e.nextthink = time;
+               //e.drawonlytoclient = wep.owner;
+               setcefc(e, wepent_customize);
                Net_LinkEntity(e, false, 0, wepent_send);
        }