OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Revert "Added SECMF_HURTMONSTERS, SECMF_HARMINAIR and NOSECTORDAMAGE."

Browse source 
This reverts commit 391f496512.
This commit is contained in:
Rachael Alexanderson 2024-10-19 10:25:03 -04:00
commit 4ba53e34e4
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
13 changed files with 58 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/playsim/p_mobj.cpp
View file

@ -4435,14 +4435,6 @@ void AActor::Tick ()
// must have been removed
if (ObjectFlags & OF_EuthanizeMe) return;
}
//[inkoalawetrust] Genericized level damage handling that makes sector, 3D floor, and TERRAIN flat damage affect monsters and other NPCs too.
if (!(flags9 & MF9_NOSECTORDAMAGE) && (player || (player == nullptr && Sector->MoreFlags & SECMF_HURTMONSTERS)))
{
P_ActorOnSpecial3DFloor(this);
P_ActorInSpecialSector(this,Sector);
if (!isAbove(Sector->floorplane.ZatPoint(this)) || waterlevel) // Actor must be touching the floor for TERRAIN flats.
P_ActorOnSpecialFlat(this, P_GetThingFloorType(this));
}
if (tics != -1)
{