OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Extend SKYEXPLODE flag for LineAttack

Browse source
This commit is contained in:
Cacodemon345 2018-11-02 11:14:02 +06:00 • committed by Christoph Oelckers
commit b1d35eb0b3
8 changed files with 52 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/p_map.cpp
View file

@ -4623,9 +4623,13 @@ AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
damageType = puffDefaults->DamageType;
}
int tflags;
if (nointeract || (puffDefaults && puffDefaults->flags6 & MF6_NOTRIGGER)) tflags = TRACE_NoSky;
else tflags = TRACE_NoSky | TRACE_Impact;
uint32_t tflags = TRACE_NoSky | TRACE_Impact;
if (nointeract || (puffDefaults && puffDefaults->flags6 & MF6_NOTRIGGER)) tflags &= ~TRACE_Impact;
if (spawnSky)
{
tflags &= ~TRACE_NoSky;
tflags |= TRACE_HitSky;
}
// [MC] Check the flags and set the position according to what is desired.
// LAF_ABSPOSITION: Treat the offset parameters as direct coordinates.
@ -4683,8 +4687,16 @@ AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
{
if (trace.HitType != TRACE_HitActor)
{
if (trace.HitType == TRACE_HasHitSky || (trace.HitType == TRACE_HitWall
&& trace.Line->special == Line_Horizon && spawnSky))
{
puffFlags |= PF_HITSKY;
}
P_GeometryLineAttack(trace, t1, damage, damageType);
// position a bit closer for puffs
if (nointeract || trace.HitType != TRACE_HitWall || ((trace.Line->special != Line_Horizon) || spawnSky))
{