vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Server: TraceAttack will now track range across bullet penetration, as well

Browse source 
as handle water volume impacts.
This commit is contained in:
Marco Cawthorne 2022-02-10 16:17:24 -08:00
parent f118e34792
commit 22ab20a7b4
Signed by: eukara
GPG key ID: C196CD8BA993248A
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/server/traceattack.qc
View file

@ -44,10 +44,13 @@ TraceAttack_ImpactWorld(void)
/* cast a single bullet shot */
static void
TraceAttack_FireSingle(vector vecPos, vector vAngle, int iDamage, int iWeapon)
TraceAttack_FireSingle(vector vecPos, vector vAngle, int iDamage, int iWeapon, float dist)
{
vector range;
if (dist <= 0)
return;
range = (vAngle * 8196);
self.dimension_solid = 255;
@ -55,10 +58,12 @@ TraceAttack_FireSingle(vector vecPos, vector vAngle, int iDamage, int iWeapon)
/* make sure we can gib corpses */
int oldhitcontents = self.hitcontentsmaski;
self.hitcontentsmaski = CONTENTBITS_POINTSOLID | CONTENTBIT_CORPSE;
self.hitcontentsmaski = CONTENTBITS_POINTSOLID | CONTENTBIT_CORPSE | CONTENTBIT_WATER | CONTENTBIT_SLIME | CONTENTBIT_LAVA;
traceline(vecPos, vecPos + range, MOVE_LAGGED | MOVE_HITMODEL, self);
self.hitcontentsmaski = oldhitcontents;
dist -= trace_plane_dist;
self.dimension_solid = 254;
self.dimension_hit = 254;
@ -67,6 +72,18 @@ TraceAttack_FireSingle(vector vecPos, vector vAngle, int iDamage, int iWeapon)
if (trace_fraction >= 1.0f)
return;
/* water impact */
if (trace_endcontentsi & CONTENTBIT_WATER) {
FX_Impact(IMPACT_SLOSH, trace_endpos, trace_plane_normal);
TraceAttack_FireSingle(trace_endpos + (v_forward * 2), vAngle, iDamage / 2, iWeapon, dist);
} else if (trace_endcontentsi & CONTENTBIT_SLIME) {
FX_Impact(IMPACT_SLOSH, trace_endpos, trace_plane_normal);
TraceAttack_FireSingle(trace_endpos + (v_forward * 2), vAngle, iDamage / 2, iWeapon, dist);
} else if (trace_endcontentsi & CONTENTBIT_LAVA) {
FX_Impact(IMPACT_SLOSH, trace_endpos, trace_plane_normal);
TraceAttack_FireSingle(trace_endpos + (v_forward * 2), vAngle, iDamage / 2, iWeapon, dist);
}
if (trace_ent.takedamage == DAMAGE_YES && trace_ent.iBleeds) {
Sound_Play(trace_ent, CHAN_BODY, "damage_bullet.hit");
@ -122,7 +139,7 @@ TraceAttack_FireSingle(vector vecPos, vector vAngle, int iDamage, int iWeapon)
#ifdef BULLETPENETRATION
if (iTotalPenetrations > 0) {
iTotalPenetrations -= 1;
TraceAttack_FireSingle(trace_endpos + (v_forward * 2), vAngle, iDamage / 2, iWeapon);
TraceAttack_FireSingle(trace_endpos + (v_forward * 2), vAngle, iDamage / 2, iWeapon, dist);
}
#endif
}
@ -158,7 +175,7 @@ TraceAttack_FireBullets(int iShots, vector vecPos, int iDamage, vector vecSpread
vDir += frand * vecSpread[0] * v_right;
vDir += (vecSpread[1] * v_up) * 2;
#endif
TraceAttack_FireSingle(vecPos, vDir, iDamage, iWeapon);
TraceAttack_FireSingle(vecPos, vDir, iDamage, iWeapon, 8196);
iShots--;
}