zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: The change in r3951 knew nothing about 3D floors.

Browse source 
SVN r4152 (trunk)
This commit is contained in:
Randy Heit 2013-02-20 02:26:36 +00:00
parent fef083f59c
commit 4fe9b6112a
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_enemy.cpp
View file

@ -550,9 +550,14 @@ bool P_Move (AActor *actor)
{
actor->z = savedz;
}
else if (actor->floorsector->SecActTarget != NULL)
else
{ // The monster just hit the floor, so trigger any actions.
actor->floorsector->SecActTarget->TriggerAction(actor, SECSPAC_HitFloor);
if (actor->floorsector->SecActTarget != NULL &&
actor->floorz == actor->floorsector->floorplane.ZatPoint(actor->x, actor->y))
{
actor->floorsector->SecActTarget->TriggerAction(actor, SECSPAC_HitFloor);
}
P_CheckFor3DFloorHit(actor);
}
}
}