Merge branch 'terencehill/hud_no_joypad_keys' into 'master'

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

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index 41e3de50697897da3806f43ee65663868c1f2140..75deb92eaf8a5c448a69c7754ade78af4b82cfd7 100644 (file)
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -16,11 +16,11 @@
        { vector v = '0 0 0'; v.y = ReadByte() / 256 * 360; this.angles = v; }) \
     \
        PROP(false, health, \
-       { WriteByte(chan, this.health / 10);  /* FIXME: use a better scale? */ }, \
+       { WriteByte(chan, bound(0, this.health / 10, 255));  /* FIXME: use a better scale? */ }, \
        { this.healthvalue = ReadByte() * 10; }) \
     \
        PROP(false, armorvalue, \
-       { WriteByte(chan, this.armorvalue / 10);  /* FIXME: use a better scale? */ }, \
+       { WriteByte(chan, bound(0, this.armorvalue / 10, 255));  /* FIXME: use a better scale? */ }, \
        { this.armorvalue = ReadByte() * 10; }) \
     \
        PROP(true, netname, \
@@ -49,11 +49,8 @@
                if (i >= BITS(16 - 1)) LOG_FATAL("Exceeded ENTCS_NETPROPS limit");
        }
 
-       bool entcs_send_init;
-       bool entcs_send(entity this, entity to, int sf)
+       bool _entcs_send(entity this, entity to, int sf, int chan)
        {
-               int chan = entcs_send_init ? MSG_INIT : MSG_ENTITY;
-               entcs_send_init = false;
                entity player = this.owner;
                sf |= BIT(0) | BIT(1);
                if (IS_PLAYER(to) || to.caplayer)                                  // unless spectating,
@@ -68,7 +65,11 @@
                    || player == to               // player is self
                ;
                if (!valid) sf = 0;
-               WriteHeader(chan, ENT_CLIENT_ENTCS);
+               if (chan == MSG_ENTITY)
+                       WriteHeader(chan, ENT_CLIENT_ENTCS);
+               else
+                       WriteHeader(chan, CLIENT_ENTCS);
+               WriteByte(chan, etof(player) - 1);
                WriteShort(chan, sf);
                int i = 1;
                #define X(public, fld, sv, cl) { if (sf & BIT(i)) sv; } i += 1;
@@ -77,9 +78,13 @@
                return true;
        }
 
-       void entcs_think()
+       bool entcs_send(entity this, entity to, int sf)
+       {
+               return _entcs_send(this, to, sf, MSG_ENTITY);
+       }
+
+       void entcs_think(entity this)
        {
-               SELFPARAM();
                this.nextthink = time + 0.033333333333;  // TODO: increase this to like 0.15 once the client can do smoothing
                entity o = this.owner;
                int i = 1;
@@ -92,23 +97,21 @@
                        i += 1;
                ENTCS_NETPROPS(X);
        #undef X
+           setorigin(this, this.origin);  // relink
        }
 
        void entcs_attach(entity player)
        {
                entity e = player.entcs = new(entcs_sender);
-               make_pure(e);
                e.owner = player;
-               e.think = entcs_think;
+               setthink(e, entcs_think);
                e.nextthink = time;
                Net_LinkEntity(e, false, 0, entcs_send);
                if (!IS_REAL_CLIENT(player)) return;
-               FOR_EACH_CLIENT(e)
-               {
-                       assert(e.entcs);
-                       entcs_send_init = true;
-                       entcs_send(e.entcs, player, BITS(23));
-               }
+               FOREACH_CLIENT(true, {
+                       assert(it.entcs);
+                       _entcs_send(it.entcs, msg_entity = player, BITS(23), MSG_ONE);
+               });
        }
 
        void entcs_detach(entity player)
@@ -122,15 +125,16 @@
 
 #ifdef CSQC
 
-       void Ent_RemoveEntCS()
+       void Ent_RemoveEntCS(entity this)
        {
-               SELFPARAM();
-               entcs_receiver(this.sv_entnum, NULL);
+               int n = this.sv_entnum;
+               entity e = entcs_receiver(n);
+               entcs_receiver(n, NULL);
+               if (e != this) remove(e);
        }
 
-       void entcs_think()
+       void entcs_think(entity this)
        {
-               SELFPARAM();
                entity e = CSQCModel_server2csqc(this.sv_entnum);
                if (e == NULL)
                {
@@ -147,16 +151,33 @@
                }
        }
 
-       NET_HANDLE(ENT_CLIENT_ENTCS, bool isnew)
+       bool ReadEntcs(entity this)
        {
-               if (isnew)
+               int n = ReadByte();
+               entity e = entcs_receiver(n);
+               if (e == NULL)
                {
-                       make_pure(this);
-                       this.classname = "entcs_receiver";
-                       this.entremove = Ent_RemoveEntCS;
-                       this.think = entcs_think;
+                       if (this)
+                       {
+                               e = this;
+                       }
+                       else
+                       {
+                               e = new(entcs_receiver);
+                               make_pure(e);
+                       }
+                       e.sv_entnum = n;
+                       setthink(e, entcs_think);
+                       entcs_receiver(n, e);
+               }
+               else if (this && e != this)
+               {
+                       this.classname = "entcs_gc";
+                       this.sv_entnum = n;
                }
+               this = e;
                InterpolateOrigin_Undo(this);
+               this.sv_entnum = n;
                int sf = ReadShort();
                this.has_sv_origin = false;
                this.m_entcs_private = boolean(sf & BIT(0));
@@ -164,11 +185,26 @@
                #define X(public, fld, sv, cl) { if (sf & BIT(i)) cl; } i += 1;
                ENTCS_NETPROPS(X);
        #undef X
-               entcs_receiver(this.sv_entnum, this);
                this.iflags |= IFLAG_ORIGIN;
                InterpolateOrigin_Note(this);
-               this.think();
+               WITHSELF(this, getthink(this)(this));
                return true;
        }
 
+       NET_HANDLE(ENT_CLIENT_ENTCS, bool isnew)
+       {
+               if (isnew)
+               {
+                       make_pure(this);
+                       this.classname = "entcs_receiver";
+                       this.entremove = Ent_RemoveEntCS;
+               }
+               return ReadEntcs(this);
+       }
+
+       NET_HANDLE(CLIENT_ENTCS, bool isnew)
+       {
+               return ReadEntcs(NULL);
+       }
+
 #endif