#include "ent_cs.qh"
// #define PROP(public, fld, sv, cl)
-#define ENTCS_NETPROPS(PROP) \
- PROP(true, sv_entnum, \
- { WriteByte(chan, etof(player) - 1); }, \
- { this.sv_entnum = ReadByte(); }) \
- \
+#define ENTCS_NETPROPS(PROP) PROP(false, sv_entnum, {}, {}) /* sentinel */ \
PROP(false, origin, \
{ WriteShort(chan, this.origin.x); WriteShort(chan, this.origin.y); \
WriteShort(chan, this.origin.z); }, \
{ 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, \
PROP(true, 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(); }) \
\
/**/
int ENTCS_PUBLICMASK = 0;
STATIC_INIT(ENTCS_PUBLICMASK)
{
- int i = 1;
- #define X(public, fld, sv, cl) { if (public) ENTCS_PUBLICMASK |= BIT(i); } i += 1;
+ int i = 0;
+ #define X(public, fld, sv, cl) { \
+ if (public) { \
+ ENTCS_PUBLICMASK |= BIT(i); \
+ } \
+ i += 1; \
+ }
ENTCS_NETPROPS(X);
#undef X
if (i >= BITS(16 - 1)) LOG_FATAL("Exceeded ENTCS_NETPROPS limit");
bool _entcs_send(entity this, entity to, int sf, int chan)
{
entity player = this.owner;
- sf |= BIT(0) | BIT(1);
- if (IS_PLAYER(to) || to.caplayer) // unless spectating,
- {
- bool same_team = (to == player) || (teamplay && player.team == to.team);
- if (!same_team && !radar_showennemies) sf &= ENTCS_PUBLICMASK; // no private updates
- }
+ sf |= BIT(0); // assume private
+ do {
+ if (radar_showennemies) break;
+ if (SAME_TEAM(to, player)) break;
+ if (!(IS_PLAYER(to) || to.caplayer) && time > game_starttime) break;
+ sf &= ENTCS_PUBLICMASK; // no private updates
+ } while (0);
sf |= this.m_forceupdate;
this.m_forceupdate = 0;
- bool valid =
- IS_PLAYER(player) // player must be active
- || player == to // player is self
- ;
- 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;
+ int i = 0;
+ #define X(public, fld, sv, cl) { \
+ if (sf & BIT(i)) { \
+ sv; \
+ } \
+ i += 1; \
+ }
ENTCS_NETPROPS(X);
#undef X
return true;
return _entcs_send(this, to, sf, MSG_ENTITY);
}
- void entcs_think()
+ 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;
- #define X(public, fld, sv, cl) \
- if (o.fld != this.fld) \
- { \
+ int i = 0;
+ #define X(public, fld, sv, cl) { \
+ if (o.fld != this.fld) { \
this.fld = o.fld; \
this.SendFlags |= BIT(i); \
} \
- i += 1;
+ 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(e.entcs, msg_entity = player, BITS(23), MSG_ONE);
- }
+ 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;
}
#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();
entity e = CSQCModel_server2csqc(this.sv_entnum);
if (e == NULL)
{
bool ReadEntcs(entity this)
{
int n = ReadByte();
- if (this) this.sv_entnum = n;
entity e = entcs_receiver(n);
- if (!e)
+ #define X(e) { \
+ setthink(e, entcs_think); \
+ entcs_receiver(n, e); \
+ }
+ if (e == NULL)
{
- if (this)
+ if (!this)
{
- e = this;
+ // initial = temp
+ e = new_pure(entcs_receiver);
+ X(e);
}
else
{
- e = new(entcs_receiver);
- make_pure(e);
- e.think = entcs_think;
+ // initial = linked
+ e = this;
+ X(e);
}
- entcs_receiver(n, e);
}
- this = e;
- InterpolateOrigin_Undo(this);
- this.sv_entnum = n;
+ else if (e != this && this)
+ {
+ // upgrade to linked
+ delete(e);
+ e = this;
+ X(e);
+ }
+ #undef X
+ InterpolateOrigin_Undo(e);
+ e.sv_entnum = n;
int sf = ReadShort();
- 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;
+ e.has_sv_origin = false;
+ e.m_entcs_private = boolean(sf & BIT(0));
+ int i = 0;
+ #define X(public, fld, sv, cl) { \
+ if (sf & BIT(i)) { \
+ cl; \
+ } \
+ i += 1; \
+ }
ENTCS_NETPROPS(X);
#undef X
- this.iflags |= IFLAG_ORIGIN;
- InterpolateOrigin_Note(this);
- WITH(entity, self, this, this.think());
+ e.iflags |= IFLAG_ORIGIN;
+ InterpolateOrigin_Note(e);
+ getthink(e)(e);
return true;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff