#include "ent_cs.qh"
+#include <common/gamemodes/_mod.qh>
+#include <common/resources.qh>
+#ifdef SVQC
+#include <server/resources.qh>
+#endif
+
+REGISTRY(EntCSProps, BITS(16) - 1)
+#define EntCSProps_from(i) _EntCSProps_from(i, NULL)
+REGISTER_REGISTRY(EntCSProps)
+REGISTRY_SORT(EntCSProps)
+REGISTRY_CHECK(EntCSProps)
+STATIC_INIT(RegisterEntCSProps_renumber) { FOREACH(EntCSProps, true, it.m_id = i); }
+
+// these entcs_props ids need to be referenced directly
+int ENTCS_PROP_ENTNUM_id = 0;
+int ENTCS_PROP_ORIGIN_id = 0;
+STATIC_INIT(RegisterEntCSProps_setglobalids)
+{
+ FOREACH(EntCSProps, true, {
+ if (it.registered_id == "ENTCS_PROP_ENTNUM")
+ ENTCS_PROP_ENTNUM_id = it.m_id;
+ if (it.registered_id == "ENTCS_PROP_ORIGIN")
+ ENTCS_PROP_ORIGIN_id = it.m_id;
+ });
+}
+
+#ifdef SVQC
+// Force an origin update, for player sounds
+void entcs_force_origin(entity player)
+{
+ CS(player).entcs.m_forceupdate = BIT(ENTCS_PROP_ORIGIN_id);
+}
+#endif
+
+.bool m_public;
+.bool(entity ent, entity player) m_check;
+.void(entity ent, entity player) m_set;
+.void(int chan, entity ent) m_send;
+.void(entity ent) m_receive;
+
+#ifdef SVQC
+#define _ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) \
+ void id##_set(entity ent, entity player) { setprop(ent.(checkprop), player.(checkprop)); } \
+ void id##_send(int chan, entity ent) { LAMBDA(svsend); } \
+ REGISTER(EntCSProps, ENTCS_PROP, id, m_id, new_pure(entcs_prop)) { \
+ this.m_public = ispublic; \
+ this.m_check = id##_check; \
+ this.m_set = id##_set; \
+ this.m_send = id##_send; \
+ }
+
+#define ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) \
+ bool id##_check(entity ent, entity player) { return (ent.(checkprop) != player.(checkprop)); } \
+ _ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive)
+
+#define ENTCS_PROP_CODED(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \
+ bool id##_check(entity ent, entity player) { \
+ return (floor(ent.(checkprop)) / decfactor != floor(player.(checkprop)) / decfactor); \
+ } \
+ _ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive)
+
+#elif defined(CSQC)
+#define ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) \
+ void id##_receive(entity ent) { LAMBDA(clreceive); } \
+ REGISTER(EntCSProps, ENTCS_PROP, id, m_id, new_pure(entcs_prop)) { \
+ this.m_public = ispublic; \
+ this.m_receive = id##_receive; \
+ }
+
+#define ENTCS_PROP_CODED(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \
+ ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive)
+#endif
+
+#ifdef SVQC
+#define ENTCS_PROP_RESOURCE(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \
+ bool id##_check(entity ent, entity player) { \
+ return (floor(GetResourceAmount(ent, checkprop) / decfactor) != floor(GetResourceAmount(player, checkprop) / decfactor)); \
+ } \
+ void id##_set(entity ent, entity player) { SetResourceAmountExplicit(ent, checkprop, GetResourceAmount(player, checkprop)); } \
+ void id##_send(int chan, entity ent) { LAMBDA(svsend); } \
+ REGISTER(EntCSProps, ENTCS_PROP, id, m_id, new_pure(entcs_prop)) { \
+ this.m_public = ispublic; \
+ this.m_check = id##_check; \
+ this.m_set = id##_set; \
+ this.m_send = id##_send; \
+ }
+#elif defined(CSQC)
+#define ENTCS_PROP_RESOURCE(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \
+ void id##_receive(entity ent) { LAMBDA(clreceive); } \
+ REGISTER(EntCSProps, ENTCS_PROP, id, m_id, new_pure(entcs_prop)) { \
+ this.m_public = ispublic; \
+ this.m_receive = id##_receive; \
+ }
+#endif
#define ENTCS_SET_NORMAL(var, x) MACRO_BEGIN \
var = x; \
/** the engine player name strings are mutable! */
#define ENTCS_SET_MUTABLE_STRING(var, x) MACRO_BEGIN \
- if (var) strunzone(var); \
- var = strzone(x); \
+ strcpy(var, x); \
MACRO_END
-// #define PROP(public, fld, set, sv, cl)
-#define ENTCS_NETPROPS(ent, PROP) PROP(false, sv_entnum, ENTCS_SET_NORMAL, {}, {}) /* sentinel */ \
- PROP(false, origin, ENTCS_SET_NORMAL, \
- { WriteShort(chan, ent.origin.x); WriteShort(chan, ent.origin.y); \
- WriteShort(chan, ent.origin.z); }, \
- { ent.has_sv_origin = true; vector v; v.x = ReadShort(); v.y = ReadShort(); v.z = ReadShort(); setorigin(ent, v); }) \
- \
- PROP(false, angles_y, ENTCS_SET_NORMAL, \
- { WriteByte(chan, ent.angles.y / 360 * 256); }, \
- { vector v = '0 0 0'; v.y = ReadByte() / 256 * 360; ent.angles = v; }) \
- \
- PROP(false, health, ENTCS_SET_NORMAL, \
- { WriteByte(chan, bound(0, ent.health / 10, 255)); /* FIXME: use a better scale? */ }, \
- { ent.healthvalue = ReadByte() * 10; }) \
- \
- PROP(false, armorvalue, ENTCS_SET_NORMAL, \
- { WriteByte(chan, bound(0, ent.armorvalue / 10, 255)); /* FIXME: use a better scale? */ }, \
- { ent.armorvalue = ReadByte() * 10; }) \
- \
- PROP(true, netname, ENTCS_SET_MUTABLE_STRING, \
- { WriteString(chan, ent.netname); }, \
- { if (ent.netname) strunzone(ent.netname); ent.netname = strzone(ReadString()); }) \
- \
- PROP(true, model, ENTCS_SET_NORMAL, \
- { WriteString(chan, ent.model); }, \
- { if (ent.model) strunzone(ent.model); ent.model = strzone(ReadString()); }) \
- \
- PROP(true, skin, ENTCS_SET_NORMAL, \
- { WriteByte(chan, ent.skin); }, \
- { ent.skin = ReadByte(); }) \
- \
- PROP(true, clientcolors, ENTCS_SET_NORMAL, \
- { WriteByte(chan, ent.clientcolors); }, \
- { ent.colormap = ReadByte(); }) \
- \
- PROP(true, frags, ENTCS_SET_NORMAL, \
- { WriteShort(chan, ent.frags); }, \
- { ent.frags = ReadShort(); }) \
- \
- /**/
+ENTCS_PROP(ENTNUM, false, sv_entnum, ENTCS_SET_NORMAL, {}, {}) /* sentinel */
+
+ENTCS_PROP(ORIGIN, false, origin, ENTCS_SET_NORMAL,
+ { WriteVector(chan, ent.origin); },
+ { ent.has_sv_origin = true; vector v = ReadVector(); setorigin(ent, v); })
+
+#define DEC_FACTOR (360 / 32)
+ENTCS_PROP_CODED(ANGLES, false, angles_y, ENTCS_SET_NORMAL, DEC_FACTOR,
+ { WriteByte(chan, ent.angles.y / DEC_FACTOR); },
+ { vector v = '0 0 0'; v.y = ReadByte() * DEC_FACTOR; ent.angles = v; })
+#undef DEC_FACTOR
+
+// FIXME: use a better scale?
+#define DEC_FACTOR 10
+ENTCS_PROP_RESOURCE(HEALTH, false, RESOURCE_HEALTH, ENTCS_SET_NORMAL, DEC_FACTOR,
+ { WriteByte(chan, bound(0, GetResourceAmount(ent, RESOURCE_HEALTH) / DEC_FACTOR, 255)); },
+ { ent.healthvalue = ReadByte() * DEC_FACTOR; })
+
+ENTCS_PROP_RESOURCE(ARMOR, false, RESOURCE_ARMOR, ENTCS_SET_NORMAL, DEC_FACTOR,
+ { WriteByte(chan, bound(0, GetResourceAmount(ent, RESOURCE_ARMOR) / DEC_FACTOR, 255)); },
+ { SetResourceAmountExplicit(ent, RESOURCE_ARMOR, ReadByte() * DEC_FACTOR); })
+#undef DEC_FACTOR
+
+ENTCS_PROP(NAME, true, netname, ENTCS_SET_MUTABLE_STRING,
+ { WriteString(chan, ent.netname); },
+ { strcpy(ent.netname, ReadString()); })
+
+ENTCS_PROP(MODEL, true, model, ENTCS_SET_NORMAL,
+ { WriteString(chan, ent.model); },
+ { strcpy(ent.model, ReadString()); })
+
+ENTCS_PROP(SKIN, true, skin, ENTCS_SET_NORMAL,
+ { WriteByte(chan, ent.skin); },
+ { ent.skin = ReadByte(); })
+
+ENTCS_PROP(CLIENTCOLORS, true, clientcolors, ENTCS_SET_NORMAL,
+ { WriteByte(chan, ent.clientcolors); },
+ { ent.colormap = ReadByte(); })
+
+ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL,
+ { WriteShort(chan, ent.frags); },
+ { ent.frags = ReadShort(); })
#ifdef SVQC
int ENTCS_PUBLICMASK = 0;
STATIC_INIT(ENTCS_PUBLICMASK)
{
- int i = 0;
- #define X(public, fld, set, sv, cl) { \
- if (public) { \
- ENTCS_PUBLICMASK |= BIT(i); \
- } \
- i += 1; \
- }
- ENTCS_NETPROPS(this, X);
- #undef X
- if (i >= BITS(16 - 1)) LOG_FATAL("Exceeded ENTCS_NETPROPS limit");
+ FOREACH(EntCSProps, it.m_public,
+ {
+ ENTCS_PUBLICMASK |= BIT(it.m_id);
+ });
}
bool _entcs_send(entity this, entity to, int sf, int chan)
{
entity player = this.owner;
- sf |= BIT(0); // assume private
+ sf |= BIT(ENTCS_PROP_ENTNUM_id); // assume private
do {
- if (radar_showennemies) break;
- if (SAME_TEAM(to, player)) break;
- if (!(IS_PLAYER(to) || to.caplayer) && time > game_starttime) break;
+ if (IS_PLAYER(player))
+ {
+ 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;
if (chan == MSG_ENTITY)
WriteHeader(chan, CLIENT_ENTCS);
WriteByte(chan, etof(player) - 1);
WriteShort(chan, sf);
- int i = 0;
- #define X(public, fld, set, sv, cl) { \
- if (sf & BIT(i)) { \
- sv; \
- } \
- i += 1; \
- }
- ENTCS_NETPROPS(this, X);
- #undef X
+ FOREACH(EntCSProps, sf & BIT(it.m_id),
+ {
+ it.m_set(this, player);
+ it.m_send(chan, this);
+ });
return true;
}
{
this.nextthink = time + 0.033333333333; // TODO: increase this to like 0.15 once the client can do smoothing
entity o = this.owner;
- int i = 0;
- #define X(public, fld, set, sv, cl) { \
- if (o.fld != this.fld) { \
- set(this.fld, o.fld); \
- this.SendFlags |= BIT(i); \
- } \
- i += 1; \
- }
- ENTCS_NETPROPS(this, X);
- #undef X
- setorigin(this, this.origin); // relink
+ FOREACH(EntCSProps, it.m_check(this, o),
+ {
+ this.SendFlags |= BIT(it.m_id);
+ });
+ setorigin(this, this.origin); // relink
}
void entcs_attach(entity player)
{
- entity e = player.entcs = new(entcs_sender);
+ entity e = CS(player).entcs = new(entcs_sender);
e.owner = player;
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;
- delete(player.entcs);
- player.entcs = NULL;
+ if (!CS(player).entcs) return;
+ delete(CS(player).entcs);
+ CS(player).entcs = NULL;
}
#endif
int n = this.sv_entnum;
entity e = entcs_receiver(n);
entcs_receiver(n, NULL);
+ strfree(e.netname);
+ strfree(e.model);
if (e != this) delete(e);
}
// `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);
+ strcpy(this.model, e.model);
}
}
{
int n = ReadByte();
entity e = entcs_receiver(n);
- #define X(e) { \
- setthink(e, entcs_think); \
- entcs_receiver(n, e); \
- }
if (e == NULL)
{
if (!this)
- {
// initial = temp
e = new_pure(entcs_receiver);
- X(e);
- }
else
- {
// initial = linked
e = this;
- X(e);
- }
+ setthink(e, entcs_think);
+ entcs_receiver(n, e);
}
else if (e != this && this)
{
// upgrade to linked
delete(e);
e = this;
- X(e);
+ setthink(e, entcs_think);
+ entcs_receiver(n, e);
}
- #undef X
+
InterpolateOrigin_Undo(e);
e.sv_entnum = n;
int sf = ReadShort();
e.has_sv_origin = false;
- e.m_entcs_private = boolean(sf & BIT(0));
- int i = 0;
- #define X(public, fld, set, sv, cl) { \
- if (sf & BIT(i)) { \
- cl; \
- } \
- i += 1; \
- }
- ENTCS_NETPROPS(e, X);
- #undef X
+ e.m_entcs_private = boolean(sf & BIT(ENTCS_PROP_ENTNUM_id));
+ FOREACH(EntCSProps, sf & BIT(it.m_id),
+ {
+ it.m_receive(e);
+ });
e.iflags |= IFLAG_ORIGIN;
InterpolateOrigin_Note(e);
getthink(e)(e);
projects / xonotic / xonotic-data.pk3dir.git / blobdiff