From 77a4b9a29bfdfb8a772a85c27d67399097d241d0 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Thu, 23 Feb 2012 03:24:13 +0000 Subject: [PATCH] - Give actors modified via Dehacked than CANUSEWALLS flag, whether they look like monsters at first glance or not. SVN r3386 (trunk) --- src/d_dehacked.cpp | 8 +++++++- src/p_spec.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp index 5ea9d6644..da0b901a2 100644 --- a/src/d_dehacked.cpp +++ b/src/d_dehacked.cpp @@ -1194,15 +1194,21 @@ static int PatchThing (int thingy) PushTouchedActor(const_cast(type)); } - // Make MF3_ISMONSTER match MF_COUNTKILL + // If MF_COUNTKILL is set, make sure the other standard monster flags are + // set, too. And vice versa. if (info->flags & MF_COUNTKILL) { + info->flags2 |= MF2_PUSHWALL | MF2_MCROSS | MF2_PASSMOBJ; info->flags3 |= MF3_ISMONSTER; } else { + info->flags2 &= ~(MF2_PUSHWALL | MF2_MCROSS); info->flags3 &= ~MF3_ISMONSTER; } + // Everything that's altered here gets the CANUSEWALLS flag, just in case + // it calls P_Move(). + info->flags4 |= MF4_CANUSEWALLS; if (patchedStates) { statedef.InstallStates(type->ActorInfo, info); diff --git a/src/p_spec.cpp b/src/p_spec.cpp index 5b9c40b6e..a41fa2cad 100644 --- a/src/p_spec.cpp +++ b/src/p_spec.cpp @@ -313,7 +313,7 @@ bool P_TestActivateLine (line_t *line, AActor *mo, int side, int activationType) { lineActivation |= SPAC_Cross|SPAC_MCross; } - if (activationType ==SPAC_Use || activationType == SPAC_UseBack) + if (activationType == SPAC_Use || activationType == SPAC_UseBack) { if (!P_CheckSwitchRange(mo, line, side)) {