X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qc;h=41183d85b21d5c505b4becc57bba4f1df396971c;hb=e424ba544c41fc40b241b17bd7c1d9c2fc930705;hp=b1a9692819b490e13eb175f9f3e81be52f2642a3;hpb=5c4a43fc6c95ffad714ba33b9f5c9e5e20fdfbba;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc index b1a969281..41183d85b 100644 --- a/qcsrc/common/ent_cs.qc +++ b/qcsrc/common/ent_cs.qc @@ -3,37 +3,45 @@ // #define PROP(public, fld, sv, cl) #define ENTCS_NETPROPS(PROP) \ PROP(true, sv_entnum, \ - { WriteByte(MSG_ENTITY, etof(player) - 1); }, \ + { WriteByte(chan, etof(player) - 1); }, \ { this.sv_entnum = ReadByte(); }) \ \ PROP(false, origin, \ - { WriteShort(MSG_ENTITY, this.origin.x); WriteShort(MSG_ENTITY, this.origin.y); \ - WriteShort(MSG_ENTITY, this.origin.z); }, \ - { this.has_origin = true; vector v; v.x = ReadShort(); v.y = ReadShort(); v.z = ReadShort(); setorigin(this, v); }) \ + { WriteShort(chan, this.origin.x); WriteShort(chan, this.origin.y); \ + WriteShort(chan, this.origin.z); }, \ + { this.has_sv_origin = true; vector v; v.x = ReadShort(); v.y = ReadShort(); v.z = ReadShort(); setorigin(this, v); }) \ \ PROP(false, angles_y, \ - { WriteByte(MSG_ENTITY, this.angles.y / 360 * 256); }, \ + { WriteByte(chan, this.angles.y / 360 * 256); }, \ { vector v = '0 0 0'; v.y = ReadByte() / 256 * 360; this.angles = v; }) \ \ PROP(false, health, \ - { WriteByte(MSG_ENTITY, 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(MSG_ENTITY, 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, \ - { WriteString(MSG_ENTITY, this.netname); }, \ + { WriteString(chan, this.netname); }, \ { if (this.netname) strunzone(this.netname); this.netname = strzone(ReadString()); }) \ \ PROP(true, model, \ - { WriteString(MSG_ENTITY, this.model); }, \ + { WriteString(chan, this.model); }, \ { if (this.model) strunzone(this.model); this.model = strzone(ReadString()); }) \ \ PROP(true, skin, \ - { WriteByte(MSG_ENTITY, this.skin); }, \ + { WriteByte(chan, this.skin); }, \ { this.skin = ReadByte(); }) \ + \ + PROP(true, clientcolors, \ + { WriteByte(chan, this.clientcolors); }, \ + { this.colormap = ReadByte(); }) \ + \ + PROP(true, frags, \ + { WriteShort(chan, this.frags); }, \ + { this.frags = ReadShort(); }) \ \ /**/ @@ -49,10 +57,10 @@ if (i >= BITS(16 - 1)) LOG_FATAL("Exceeded ENTCS_NETPROPS limit"); } - bool entcs_send(entity this, entity to, int sf) + bool _entcs_send(entity this, entity to, int sf, int chan) { entity player = this.owner; - sf |= 1; + sf |= BIT(0) | BIT(1); if (IS_PLAYER(to) || to.caplayer) // unless spectating, { bool same_team = (to == player) || (teamplay && player.team == to.team); @@ -61,13 +69,17 @@ sf |= this.m_forceupdate; this.m_forceupdate = 0; bool valid = - IS_PLAYER(player) // player must be active - && player.deadflag == DEAD_NO // player must be alive - || player == to // player is self + time > game_starttime + && (IS_PLAYER(player) // player must be active + || player == to) // player is self ; - if (!valid) return false; - WriteHeader(MSG_ENTITY, ENT_CLIENT_ENTCS); - WriteShort(MSG_ENTITY, sf); + if (!valid) sf = 0; + 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; ENTCS_NETPROPS(X); @@ -75,9 +87,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; @@ -90,22 +106,27 @@ 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; + FOREACH_CLIENT(true, { + assert(it.entcs); + _entcs_send(it.entcs, msg_entity = player, BITS(23), MSG_ONE); + }); } void entcs_detach(entity player) { if (!player.entcs) return; - remove(player.entcs); + delete(player.entcs); player.entcs = NULL; } @@ -113,53 +134,86 @@ #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) delete(e); } - void entcs_think() + void entcs_think(entity this) { - SELFPARAM(); - this.nextthink = time; - entity e = CSQCModel_server2csqc(this.sv_entnum + 1); - bool exists = !!e; - if (exists) + entity e = CSQCModel_server2csqc(this.sv_entnum); + if (e == NULL) { - this.has_origin = true; - this.origin = e.origin; - // `cl_forceplayermodels 1` sounds will be wrong until the player has been in the PVS, but so be it - if (this.model != e.model) - { - if (this.model) strunzone(this.model); - this.model = strzone(e.model); - } + this.has_origin = this.has_sv_origin; + return; + } + this.has_origin = true; + this.origin = e.origin; + // `cl_forceplayermodels 1` sounds will be wrong until the player has been in the PVS, but so be it + if (this.model != e.model) + { + if (this.model) strunzone(this.model); + this.model = strzone(e.model); } } - 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; - this.nextthink = time; + if (this) + { + e = this; + } + else + { + e = new(entcs_receiver); + make_pure(e); + } + e.sv_entnum = n; + setthink(e, entcs_think); + entcs_receiver(n, e); } - InterpolateOrigin_Undo(); + 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_origin = false; - this.m_entcs_private = boolean(sf & 1); + this.has_sv_origin = false; + this.m_entcs_private = boolean(sf & BIT(0)); int i = 1; #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(); + InterpolateOrigin_Note(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