zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 06:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a couple old uses of actor->x and friends

Browse source
This commit is contained in:
Eevee (Lexy Munroe) 2016-01-21 16:54:49 -08:00
parent 85a82bc6e8
commit 3e28b195ce
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_acs.cpp
View file

@ -4140,7 +4140,7 @@ bool DLevelScript::DoCheckActorTexture(int tid, AActor *activator, int string, b
if (floor)
{
fixed_t z = actor->z;
fixed_t z = actor->Z();
// Looking through planes from top to bottom
for (i = 0; i < numff; ++i)
{
@ -4156,8 +4156,8 @@ bool DLevelScript::DoCheckActorTexture(int tid, AActor *activator, int string, b
}
else if (!(ff->flags & FF_SOLID) &&
tex == TexMan[*ff->top.texture] &&
z <= ff->top.plane->ZatPoint(actor->x, actor->y) &&
z >= ff->bottom.plane->ZatPoint(actor->x, actor->y))
z <= ff->top.plane->ZatPoint(actor->X(), actor->Y()) &&
z >= ff->bottom.plane->ZatPoint(actor->X(), actor->Y()))
{ // Having your feet within a liquid counts as being "on" it
return true;
}