zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fixed: Editing the player (thing #1) with DeHacked would remove its MF2_PUSHWALL flag. 

SVN r3740 (trunk)
This commit is contained in:
Randy Heit 2012-07-06 03:04:06 +00:00
parent 9757492b7a
commit dc641766d3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/d_dehacked.cpp
View File

@ -1232,15 +1232,18 @@ static int PatchThing (int thingy)
// If MF_COUNTKILL is set, make sure the other standard monster flags are
// set, too. And vice versa.
if (info->flags & MF_COUNTKILL)
if (thingy != 1) // don't mess with the player's flags
{
info->flags2 |= MF2_PUSHWALL | MF2_MCROSS | MF2_PASSMOBJ;
info->flags3 |= MF3_ISMONSTER;
}
else
{
info->flags2 &= ~(MF2_PUSHWALL | MF2_MCROSS);
info->flags3 &= ~MF3_ISMONSTER;
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().