.void(entity ent) m_receive;
#ifdef SVQC
-#define ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) \
- bool id##_check(entity ent, entity player) { return (ent.(checkprop) != player.(checkprop)); } \
+#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_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); } \
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, svsend, clreceive) \
- bool id##_check(entity ent, entity player) { return (GetResourceAmount(ent, checkprop) != GetResourceAmount(player, checkprop)); } \
+#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_send = id##_send; \
}
#elif defined(CSQC)
-#define ENTCS_PROP_RESOURCE(id, ispublic, checkprop, setprop, svsend, clreceive) \
+#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; \
{ WriteVector(chan, ent.origin); },
{ ent.has_sv_origin = true; vector v = ReadVector(); setorigin(ent, v); })
-ENTCS_PROP(ANGLES, 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; })
+#define DEC_FACTOR (360 / 256)
+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
-ENTCS_PROP_RESOURCE(HEALTH, false, RESOURCE_HEALTH, ENTCS_SET_NORMAL,
- { WriteByte(chan, bound(0, GetResourceAmount(ent, RESOURCE_HEALTH) / 10, 255)); /* FIXME: use a better scale? */ },
- { ent.healthvalue = ReadByte() * 10; })
+// 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,
- { WriteByte(chan, bound(0, GetResourceAmount(ent, RESOURCE_ARMOR) / 10, 255)); /* FIXME: use a better scale? */ },
- { SetResourceAmountExplicit(ent, RESOURCE_ARMOR, ReadByte() * 10); })
+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); },
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);
+ assert(CS(it).entcs);
+ _entcs_send(CS(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