zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-21 11:01:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- exported the blood spawning part of P_LineAttack as a virtual ZScript function.

Browse source
This commit is contained in:
Christoph Oelckers 2018-11-24 22:35:50 +01:00 committed by drfrag
parent 82ffdd5e6b
commit 681009e1ea
2 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/p_map.cpp
View file

@ -4868,38 +4868,13 @@ AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
} }
if (!(puffDefaults != NULL && puffDefaults->flags3&MF3_BLOODLESSIMPACT)) if (!(puffDefaults != NULL && puffDefaults->flags3&MF3_BLOODLESSIMPACT))
{ {
bool bloodsplatter = (t1->flags5 & MF5_BLOODSPLATTER) || IFVIRTUALPTR(trace.Actor, AActor, SpawnLineAttackBlood)
(t1->player != nullptr && t1->player->ReadyWeapon != nullptr &&
(t1->player->ReadyWeapon->WeaponFlags & WIF_AXEBLOOD));
bool axeBlood = (t1->player != nullptr &&
t1->player->ReadyWeapon != nullptr &&
(t1->player->ReadyWeapon->WeaponFlags & WIF_AXEBLOOD));
if (!bloodsplatter && !axeBlood &&
!(trace.Actor->flags & MF_NOBLOOD) &&
!(trace.Actor->flags2 & (MF2_INVULNERABLE | MF2_DORMANT)))
{ {
P_SpawnBlood(bleedpos, trace.SrcAngleFromTarget, newdam > 0 ? newdam : damage, trace.Actor); VMValue params[] = { trace.Actor, t1, bleedpos.X, bleedpos.Y, bleedpos.Z, trace.SrcAngleFromTarget.Degrees, damage, newdam };
VMCall(func, params, countof(params), nullptr, 0);
} }
if (damage) if (damage)
{ {
if (bloodsplatter || axeBlood)
{
if (!(trace.Actor->flags&MF_NOBLOOD) &&
!(trace.Actor->flags2&(MF2_INVULNERABLE | MF2_DORMANT)))
{
if (axeBlood)
{
P_BloodSplatter2(bleedpos, trace.Actor, trace.SrcAngleFromTarget);
}
if (pr_lineattack() < 192)
{
P_BloodSplatter(bleedpos, trace.Actor, trace.SrcAngleFromTarget);
}
}
}
// [RH] Stick blood to walls // [RH] Stick blood to walls
P_TraceBleed(newdam > 0 ? newdam : damage, trace.HitPos, trace.Actor, trace.SrcAngleFromTarget, pitch); P_TraceBleed(newdam > 0 ? newdam : damage, trace.HitPos, trace.Actor, trace.SrcAngleFromTarget, pitch);
} }

33
wadsrc/static/zscript/actor_attacks.txt
View file

@ -705,4 +705,37 @@ extend class Actor
} }
//==========================================================================
//
// called with the victim as 'self'
//
//==========================================================================
virtual void SpawnLineAttackBlood(Actor attacker, Vector3 bleedpos, double SrcAngleFromTarget, int originaldamage, int actualdamage)
{
if (!bNoBlood && !bDormant && !bInvulnerable)
{
let player = attacker.player;
let weapon = player? player.ReadyWeapon : null;
let axeBlood = (weapon && weapon.bAxeBlood);
let bloodsplatter = attacker.bBloodSplatter || axeBlood;
if (!bloodsplatter)
{
SpawnBlood(bleedpos, SrcAngleFromTarget, actualdamage > 0 ? actualdamage : originaldamage);
}
else if (damage)
{
if (axeBlood)
{
BloodSplatter(bleedpos, SrcAngleFromTarget, true);
}
// No else here...
if (random[LineAttack]() < 192)
{
BloodSplatter(bleedpos, SrcAngleFromTarget, false);
}
}
}
}
} }