X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fent_cs.qc;h=a7aa27961139530a73a9a7feda0d4ae1fe8d54f4;hp=0c430e26cdb4eb677486070f70dee195af5ab6f3;hb=4eab3f0253a063bdbd4e1ff64c4b2b08077c44c4;hpb=e30214cf338291f1709fb02ed5e84cad9321e156 diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc index 0c430e26cd..a7aa279611 100644 --- a/qcsrc/common/ent_cs.qc +++ b/qcsrc/common/ent_cs.qc @@ -6,16 +6,17 @@ #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); } + +REGISTRY_DEFINE_GET(EntCSProps, NULL) +STATIC_INIT(EntCSProps_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) +STATIC_INIT(EntCSProps_setglobalids) { FOREACH(EntCSProps, true, { if (it.registered_id == "ENTCS_PROP_ENTNUM") @@ -40,8 +41,8 @@ void entcs_force_origin(entity player) .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)); } \ +#define _ENTCS_PROP(id, ispublic, checkprop, checkprop_pl, setprop, svsend, clreceive) \ + void id##_set(entity ent, entity player) { setprop(ent.(checkprop), player.(checkprop_pl)); } \ void id##_send(int chan, entity ent) { LAMBDA(svsend); } \ REGISTER(EntCSProps, ENTCS_PROP, id, m_id, new_pure(entcs_prop)) { \ this.m_public = ispublic; \ @@ -50,34 +51,34 @@ void entcs_force_origin(entity player) 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(id, ispublic, checkprop, checkprop_pl, setprop, svsend, clreceive) \ + bool id##_check(entity ent, entity player) { return (ent.(checkprop) != player.(checkprop_pl)); } \ + _ENTCS_PROP(id, ispublic, checkprop, checkprop_pl, setprop, svsend, clreceive) -#define ENTCS_PROP_CODED(id, ispublic, checkprop, setprop, decfactor, svsend, clreceive) \ +#define ENTCS_PROP_CODED(id, ispublic, checkprop, checkprop_pl, setprop, decfactor, svsend, clreceive) \ bool id##_check(entity ent, entity player) { \ - return (floor(ent.(checkprop)) / decfactor != floor(player.(checkprop)) / decfactor); \ + return (floor(ent.(checkprop)) / decfactor != floor(player.(checkprop_pl)) / decfactor); \ } \ - _ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) + _ENTCS_PROP(id, ispublic, checkprop, checkprop_pl, setprop, svsend, clreceive) #elif defined(CSQC) -#define ENTCS_PROP(id, ispublic, checkprop, setprop, svsend, clreceive) \ +#define ENTCS_PROP(id, ispublic, checkprop, checkprop_pl, 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) +#define ENTCS_PROP_CODED(id, ispublic, checkprop, checkprop_pl, setprop, decfactor, svsend, clreceive) \ + ENTCS_PROP(id, ispublic, checkprop, checkprop_pl, 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)); \ + return (floor(GetResource(ent, checkprop) / decfactor) != floor(GetResource(player, checkprop) / decfactor)); \ } \ - void id##_set(entity ent, entity player) { SetResourceAmount(ent, checkprop, GetResourceAmount(player, checkprop)); } \ + void id##_set(entity ent, entity player) { SetResourceExplicit(ent, checkprop, GetResource(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; \ @@ -103,49 +104,54 @@ MACRO_END strcpy(var, x); \ MACRO_END -ENTCS_PROP(ENTNUM, false, sv_entnum, ENTCS_SET_NORMAL, {}, {}) /* sentinel */ +ENTCS_PROP(ENTNUM, false, sv_entnum, sv_entnum, ENTCS_SET_NORMAL, {}, {}) /* sentinel */ -ENTCS_PROP(ORIGIN, false, origin, ENTCS_SET_NORMAL, +ENTCS_PROP(ORIGIN, false, origin, 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, +ENTCS_PROP_CODED(ANGLES, false, angles_y, 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)); }, +ENTCS_PROP_RESOURCE(HEALTH, false, RES_HEALTH, ENTCS_SET_NORMAL, DEC_FACTOR, + { WriteByte(chan, bound(0, GetResource(ent, RES_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)); }, - { SetResourceAmount(ent, RESOURCE_ARMOR, ReadByte() * DEC_FACTOR); }) +ENTCS_PROP_RESOURCE(ARMOR, false, RES_ARMOR, ENTCS_SET_NORMAL, DEC_FACTOR, + { WriteByte(chan, bound(0, GetResource(ent, RES_ARMOR) / DEC_FACTOR, 255)); }, + { SetResourceExplicit(ent, RES_ARMOR, ReadByte() * DEC_FACTOR); }) #undef DEC_FACTOR -ENTCS_PROP(NAME, true, netname, ENTCS_SET_MUTABLE_STRING, +ENTCS_PROP(NAME, true, netname, netname, ENTCS_SET_MUTABLE_STRING, { WriteString(chan, ent.netname); }, { strcpy(ent.netname, ReadString()); }) -ENTCS_PROP(MODEL, true, model, ENTCS_SET_NORMAL, +ENTCS_PROP(MODEL, true, model, model, ENTCS_SET_NORMAL, { WriteString(chan, ent.model); }, { strcpy(ent.model, ReadString()); }) -ENTCS_PROP(SKIN, true, skin, ENTCS_SET_NORMAL, +ENTCS_PROP(SKIN, true, skin, skin, ENTCS_SET_NORMAL, { WriteByte(chan, ent.skin); }, { ent.skin = ReadByte(); }) -ENTCS_PROP(CLIENTCOLORS, true, clientcolors, ENTCS_SET_NORMAL, +ENTCS_PROP(CLIENTCOLORS, true, clientcolors, clientcolors, ENTCS_SET_NORMAL, { WriteByte(chan, ent.clientcolors); }, { ent.colormap = ReadByte(); }) -ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL, +ENTCS_PROP(FRAGS, true, frags, frags, ENTCS_SET_NORMAL, { WriteShort(chan, ent.frags); }, { ent.frags = ReadShort(); }) +// use sv_solid to avoid changing solidity state of entcs entities +ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL, + { WriteByte(chan, ent.sv_solid); }, + { ent.sv_solid = ReadByte(); }) + #ifdef SVQC int ENTCS_PUBLICMASK = 0; @@ -181,7 +187,6 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL, WriteShort(chan, sf); FOREACH(EntCSProps, sf & BIT(it.m_id), { - it.m_set(this, player); it.m_send(chan, this); }); return true; @@ -195,9 +200,10 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL, void entcs_think(entity this) { this.nextthink = time + 0.033333333333; // TODO: increase this to like 0.15 once the client can do smoothing - entity o = this.owner; - FOREACH(EntCSProps, it.m_check(this, o), + entity player = this.owner; + FOREACH(EntCSProps, it.m_check(this, player), { + it.m_set(this, player); this.SendFlags |= BIT(it.m_id); }); setorigin(this, this.origin); // relink @@ -210,6 +216,11 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL, setthink(e, entcs_think); e.nextthink = time; Net_LinkEntity(e, false, 0, entcs_send); + if (!IS_REAL_CLIENT(player)) return; + FOREACH_CLIENT(true, { + assert(CS(it).entcs); + _entcs_send(CS(it).entcs, msg_entity = player, BITS(23), MSG_ONE); + }); } void entcs_detach(entity player)