zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-05-31 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed incomplete commit for bounce flags

Browse source 
- fixed flag clearing in new function.
This commit is contained in:
Christoph Oelckers 2016-10-25 13:29:58 +02:00
parent e39bf9eaeb
commit 142278a818
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/p_actionfunctions.cpp
View file

@ -4867,13 +4867,13 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ChangeLinkFlags)
if (blockmap != -1)
{
if (blockmap == 0) self->flags &= MF_NOBLOCKMAP;
if (blockmap == 0) self->flags &= *MF_NOBLOCKMAP;
else self->flags |= MF_NOBLOCKMAP;
}
if (sector != -1)
{
if (sector == 0) self->flags &= MF_NOSECTOR;
if (sector == 0) self->flags &= *MF_NOSECTOR;
else self->flags |= MF_NOSECTOR;
}
@ -4899,19 +4899,19 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ChangeCountFlags)
if (kill != -1)
{
if (kill == 0) self->flags &= MF_COUNTKILL;
if (kill == 0) self->flags &= ~MF_COUNTKILL;
else self->flags |= MF_COUNTKILL;
}
if (item != -1)
{
if (item == 0) self->flags &= MF_COUNTITEM;
if (item == 0) self->flags &= ~MF_COUNTITEM;
else self->flags |= MF_COUNTITEM;
}
if (secret != -1)
{
if (secret == 0) self->flags5 &= MF5_COUNTSECRET;
if (secret == 0) self->flags5 &= ~MF5_COUNTSECRET;
else self->flags5 |= MF5_COUNTSECRET;
}
if (self->CountsAsKill() && self->health > 0) ++level.total_monsters;