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

Added check for hurt floors in P_IsUnderDamage().

Browse source
This commit is contained in:
inkoalawetrust 2024-03-29 21:10:36 +02:00 committed by Rachael Alexanderson
parent 391f496512
commit 9b8c79d182
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/playsim/p_enemy.cpp
View file

@ -465,6 +465,12 @@ static int P_IsUnderDamage(AActor* actor)
dir |= cl->getDirection();
}
// Q: consider crushing 3D floors too?
// [inkoalawetrust] Check for sectors that can harm the actor.
if (!(actor->flags9 & MF9_NOSECTORDAMAGE) && seclist->m_sector->damageamount > 0)
{
if (seclist->m_sector->MoreFlags & SECMF_HARMINAIR || actor->isAtZ(seclist->m_sector->LowestFloorAt(actor)) || actor->waterlevel)
return (actor->player || (actor->player == nullptr && seclist->m_sector->MoreFlags & SECMF_HURTMONSTERS)) ? -1 : 0;
}
}
return dir;
}

3
src/playsim/p_spec.cpp
View file

@ -430,10 +430,7 @@ void P_ActorInSpecialSector (AActor *victim, sector_t * sector)
// Falling, not all the way down yet?
if (!(sector->MoreFlags & SECMF_HARMINAIR) && !victim->isAtZ(sector->LowestFloorAt(victim)) && !victim->waterlevel)
{
DPrintf(2,"P_ActorInSpecialSector(): %p is not touching the floor and HARMINAIR isn't on, so they won't be harmed by the sector.\n",victim);
return;
}
// Has hit ground.