mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-25 05:31:00 +00:00
- Added IF_NOSCREENFLASH>
SVN r4145 (trunk)
This commit is contained in:
parent
619e65ad6f
commit
ae6b0c6215
3 changed files with 7 additions and 3 deletions
|
@ -964,7 +964,10 @@ void AInventory::Touch (AActor *toucher)
|
|||
if (toucher->player != NULL)
|
||||
{
|
||||
PlayPickupSound (toucher->player->mo);
|
||||
toucher->player->bonuscount = BONUSADD;
|
||||
if (!(ItemFlags & IF_NOSCREENFLASH))
|
||||
{
|
||||
toucher->player->bonuscount = BONUSADD;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -133,6 +133,7 @@ enum
|
|||
IF_PERSISTENTPOWER = 1<<18, // Powerup is kept when travelling between levels
|
||||
IF_RESTRICTABSOLUTELY = 1<<19, // RestrictedTo and ForbiddenTo do not allow pickup in any form by other classes
|
||||
IF_NEVERRESPAWN = 1<<20, // Never, ever respawns
|
||||
IF_NOSCREENFLASH = 1<<21, // No pickup flash on the player's screen
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -299,10 +299,10 @@ static FFlagDef InventoryFlags[] =
|
|||
DEFINE_FLAG(IF, PERSISTENTPOWER, AInventory, ItemFlags),
|
||||
DEFINE_FLAG(IF, RESTRICTABSOLUTELY, AInventory, ItemFlags),
|
||||
DEFINE_FLAG(IF, NEVERRESPAWN, AInventory, ItemFlags),
|
||||
DEFINE_FLAG(IF, NOSCREENFLASH, AInventory, ItemFlags),
|
||||
|
||||
DEFINE_DEPRECATED_FLAG(PICKUPFLASH),
|
||||
DEFINE_DEPRECATED_FLAG(INTERHUBSTRIP),
|
||||
};
|
||||
DEFINE_DEPRECATED_FLAG(INTERHUBSTRIP),};
|
||||
|
||||
static FFlagDef WeaponFlags[] =
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue