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

- added explicit setter functions for the count and link flags so that A_ChangeFlag and A_SetFlag can be deprecated.

Browse source
This commit is contained in:
Christoph Oelckers 2016-10-25 10:15:24 +02:00
parent ae728cc61a
commit 656b8cb16e
4 changed files with 79 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/p_actionfunctions.cpp
View file

@ -4852,6 +4852,74 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckFlag)
}
//===========================================================================
//
// A_ChangeCountFlags (needed, because these flags affect global counters)
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ChangeLinkFlags)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_INT_OPT(blockmap) { blockmap = -1; }
PARAM_INT_OPT(sector) { sector = -1; }
self->UnlinkFromWorld();
if (blockmap != -1)
{
if (blockmap == 0) self->flags &= MF_NOBLOCKMAP;
else self->flags |= MF_NOBLOCKMAP;
}
if (sector != -1)
{
if (sector == 0) self->flags &= MF_NOSECTOR;
else self->flags |= MF_NOSECTOR;
}
self->LinkToWorld();
return 0;
}
//===========================================================================
//
// A_ChangeCountFlags (needed, because these flags affect global counters)
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ChangeCountFlags)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_INT_OPT(kill) { kill = -1; }
PARAM_INT_OPT(item) { item = -1; }
PARAM_INT_OPT(secret) { secret = -1; }
if (self->CountsAsKill() && self->health > 0) --level.total_monsters;
if (self->flags & MF_COUNTITEM) --level.total_items;
if (self->flags5 & MF5_COUNTSECRET) --level.total_secrets;
if (kill != -1)
{
if (kill == 0) self->flags &= MF_COUNTKILL;
else self->flags |= MF_COUNTKILL;
}
if (item != -1)
{
if (item == 0) self->flags &= MF_COUNTITEM;
else self->flags |= MF_COUNTITEM;
}
if (secret != -1)
{
if (secret == 0) self->flags5 &= MF5_COUNTSECRET;
else self->flags5 |= MF5_COUNTSECRET;
}
if (self->CountsAsKill() && self->health > 0) ++level.total_monsters;
if (self->flags & MF_COUNTITEM) ++level.total_items;
if (self->flags5 & MF5_COUNTSECRET) ++level.total_secrets;
return 0;
}
//===========================================================================
//
// A_RaiseMaster