From 3e28b195ce38affb93e20c496bb58bb788d1b6f7 Mon Sep 17 00:00:00 2001 From: "Eevee (Lexy Munroe)" Date: Thu, 21 Jan 2016 16:54:49 -0800 Subject: [PATCH] Fix a couple old uses of actor->x and friends --- src/p_acs.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p_acs.cpp b/src/p_acs.cpp index 8725303a0..35116f7e6 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -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; }