X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Feffects%2Fqc%2Fcasings.qc;h=b49ff60faceaccb3b46a88cde7ad1825907c684c;hb=133cba402a7d11565c47dc42412b2ac0b9b8f121;hp=589e343c8df91ae795a94c1375903c429ae17296;hpb=aec48d76571bf181f87137bc2390cbce321127fa;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/effects/qc/casings.qc b/qcsrc/common/effects/qc/casings.qc index 589e343c8..b49ff60fa 100644 --- a/qcsrc/common/effects/qc/casings.qc +++ b/qcsrc/common/effects/qc/casings.qc @@ -1,5 +1,6 @@ #include "casings.qh" +#include #include #ifdef CSQC @@ -9,32 +10,43 @@ REGISTER_NET_TEMP(casings) -#if defined(SVQC) -.bool cvar_cl_casings; -#elif defined(CSQC) -bool cvar_cl_casings; -#endif REPLICATE(cvar_cl_casings, bool, "cl_casings"); +REPLICATE(cvar_r_drawviewmodel, int, "r_drawviewmodel"); #ifdef SVQC -void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float randomavel, int casingtype, entity casingowner, .entity weaponentity) +void SpawnCasing(vector vel, vector ang, int casingtype, entity casingowner, .entity weaponentity) { - if (!(CS(casingowner).cvar_cl_casings)) - return; - - entity wep = casingowner.(weaponentity); - vector org = casingowner.origin + casingowner.view_ofs + wep.spawnorigin.x * v_forward - wep.spawnorigin.y * v_right + wep.spawnorigin.z * v_up; - - if (!sound_allowed(MSG_BROADCAST, casingowner)) - casingtype |= 0x80; - - WriteHeader(MSG_ALL, casings); - WriteByte(MSG_ALL, casingtype); - WriteVector(MSG_ALL, org); - WriteShort(MSG_ALL, compressShortVector(vel)); // actually compressed velocity - WriteByte(MSG_ALL, ang.x * 256 / 360); - WriteByte(MSG_ALL, ang.y * 256 / 360); - WriteByte(MSG_ALL, ang.z * 256 / 360); + vector org = casingowner.(weaponentity).spawnorigin; + org = casingowner.origin + casingowner.view_ofs + org.x * v_forward - org.y * v_right + org.z * v_up; + + FOREACH_CLIENT(true, { + if (!(CS_CVAR(it).cvar_cl_casings)) + continue; + + casingtype &= 0x3F; // reset any bitflags that were set for the previous client + + if (it == casingowner || (IS_SPEC(it) && it.enemy == casingowner)) + { + if (!(CS_CVAR(it).cvar_r_drawviewmodel)) + continue; + + casingtype |= 0x40; // client will apply autocvar_cl_gunoffset in first person + } + else if (1 & ~checkpvs(it.origin + it.view_ofs, casingowner)) // 1 or 3 means visible + continue; + + msg_entity = it; // sound_allowed checks this + if (!sound_allowed(MSG_ONE, it)) + casingtype |= 0x80; // silent + + WriteHeader(MSG_ONE, casings); + WriteByte(MSG_ONE, casingtype); + WriteVector(MSG_ONE, org); + WriteShort(MSG_ONE, compressShortVector(vel)); // actually compressed velocity + WriteByte(MSG_ONE, ang.x * 256 / 360); + WriteByte(MSG_ONE, ang.y * 256 / 360); + // weapons only have pitch and yaw, so no need to send ang.z + }); } #endif @@ -45,6 +57,7 @@ classfield(Casing) .bool silent; classfield(Casing) .int state; classfield(Casing) .float cnt; +// this is only needed because LimitedChildrenRubble() takes a func pointer void Casing_Delete(entity this) { delete(this); @@ -59,17 +72,28 @@ void Casing_Draw(entity this) //UNSET_ONGROUND(this); } - Movetype_Physics_MatchTicrate(this, autocvar_cl_casings_ticrate, autocvar_cl_casings_sloppy); - if (wasfreed(this)) - return; // deleted by touch function - this.renderflags = 0; this.alpha = bound(0, this.cnt - time, 1); if (this.alpha < ALPHA_MIN_VISIBLE) { - Casing_Delete(this); + delete(this); + this.drawmask = 0; + return; + } + + trace_startsolid = 0; // due to cl_casings_ticrate, traces are not always performed + Movetype_Physics_MatchTicrate(this, autocvar_cl_casings_ticrate, autocvar_cl_casings_sloppy); + //if (wasfreed(this)) + // return; // deleted by touch function + + // prevent glitchy casings when the gun model is poking into a wall + // doing this here is cheaper than doing it on the server as the client performs the trace anyway + if (trace_startsolid) + { + delete(this); this.drawmask = 0; + return; } } @@ -77,20 +101,20 @@ SOUND(BRASS1, W_Sound("brass1")); SOUND(BRASS2, W_Sound("brass2")); SOUND(BRASS3, W_Sound("brass3")); Sound SND_BRASS_RANDOM() { - return Sounds_from(SND_BRASS1.m_id + floor(prandom() * 3)); + return REGISTRY_GET(Sounds, SND_BRASS1.m_id + floor(prandom() * 3)); } SOUND(CASINGS1, W_Sound("casings1")); SOUND(CASINGS2, W_Sound("casings2")); SOUND(CASINGS3, W_Sound("casings3")); Sound SND_CASINGS_RANDOM() { - return Sounds_from(SND_CASINGS1.m_id + floor(prandom() * 3)); + return REGISTRY_GET(Sounds, SND_CASINGS1.m_id + floor(prandom() * 3)); } void Casing_Touch(entity this, entity toucher) { if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) { - Casing_Delete(this); + delete(this); return; } @@ -130,28 +154,29 @@ void Casing_Damage(entity this, float thisdmg, int hittype, vector org, vector t NET_HANDLE(casings, bool isNew) { - int _state = ReadByte(); - vector org = ReadVector(); - vector vel = decompressShortVector(ReadShort()); - vector ang; - ang_x = ReadByte() * 360 / 256; - ang_y = ReadByte() * 360 / 256; - ang_z = ReadByte() * 360 / 256; + Casing casing = ListNewChildRubble(CasingsNGibs, new(casing)); + + casing.state = ReadByte(); + casing.origin = ReadVector(); + casing.velocity = decompressShortVector(ReadShort()); + casing.angles_x = ReadByte() * 360 / 256; + casing.angles_y = ReadByte() * 360 / 256; + return = true; - Casing casing = RubbleNew("casing"); - casing.silent = (_state & 0x80); - casing.state = (_state & 0x7F); - casing.origin = org; + casing.silent = casing.state & 0x80; + if (casing.state & 0x40 && !autocvar_chase_active) + casing.origin += autocvar_cl_gunoffset.x * v_forward + - autocvar_cl_gunoffset.y * v_right + + autocvar_cl_gunoffset.z * v_up; + casing.state &= 0x3F; // the 2 most significant bits are reserved for the silent and casingowner bitflags + setorigin(casing, casing.origin); - casing.velocity = vel; - casing.angles = ang; casing.drawmask = MASK_NORMAL; - casing.draw = Casing_Draw; if (isNew) IL_PUSH(g_drawables, casing); - casing.velocity = casing.velocity + 2 * prandomvec(); - casing.avelocity = '0 250 0' + 100 * prandomvec(); + casing.velocity += 2 * prandomvec(); + casing.avelocity = '0 10 0' + 100 * prandomvec(); set_movetype(casing, MOVETYPE_BOUNCE); settouch(casing, Casing_Touch); casing.move_time = time; @@ -162,17 +187,17 @@ NET_HANDLE(casings, bool isNew) { case 1: setmodel(casing, MDL_CASING_SHELL); + casing.bouncefactor = 0.25; casing.cnt = time + autocvar_cl_casings_shell_time; break; default: setmodel(casing, MDL_CASING_BULLET); + casing.bouncefactor = 0.5; casing.cnt = time + autocvar_cl_casings_bronze_time; break; } - setsize(casing, '0 0 -1', '0 0 -1'); - - RubbleLimit("casing", autocvar_cl_casings_maxcount, Casing_Delete); + LimitedChildrenRubble(CasingsNGibs, "casing", autocvar_cl_casings_maxcount, Casing_Delete, NULL); } #endif