zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-21 11:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Give actors modified via Dehacked than CANUSEWALLS flag, whether they look like monsters

Browse source 
at first glance or not.

SVN r3386 (trunk)
This commit is contained in:
Randy Heit 2012-02-23 03:24:13 +00:00
parent 22dfc82338
commit 77a4b9a29b
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/d_dehacked.cpp
View file

@ -1194,15 +1194,21 @@ static int PatchThing (int thingy)
PushTouchedActor(const_cast<PClass *>(type)); PushTouchedActor(const_cast<PClass *>(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) if (info->flags & MF_COUNTKILL)
{ {
info->flags2 |= MF2_PUSHWALL | MF2_MCROSS | MF2_PASSMOBJ;
info->flags3 |= MF3_ISMONSTER; info->flags3 |= MF3_ISMONSTER;
} }
else else
{ {
info->flags2 &= ~(MF2_PUSHWALL | MF2_MCROSS);
info->flags3 &= ~MF3_ISMONSTER; 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) if (patchedStates)
{ {
statedef.InstallStates(type->ActorInfo, info); statedef.InstallStates(type->ActorInfo, info);

2
src/p_spec.cpp
View file

@ -313,7 +313,7 @@ bool P_TestActivateLine (line_t *line, AActor *mo, int side, int activationType)
{ {
lineActivation |= SPAC_Cross|SPAC_MCross; 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)) if (!P_CheckSwitchRange(mo, line, side))
{ {