mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-27 06:12:19 +00:00
- added IF_TOSSED inventory flag.
This commit is contained in:
parent
be1a00c537
commit
aa03609b69
3 changed files with 4 additions and 0 deletions
|
@ -134,6 +134,8 @@ enum
|
||||||
IF_RESTRICTABSOLUTELY = 1<<19, // RestrictedTo and ForbiddenTo do not allow pickup in any form by other classes
|
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_NEVERRESPAWN = 1<<20, // Never, ever respawns
|
||||||
IF_NOSCREENFLASH = 1<<21, // No pickup flash on the player's screen
|
IF_NOSCREENFLASH = 1<<21, // No pickup flash on the player's screen
|
||||||
|
IF_TOSSED = 1<<22, // Was spawned by P_DropItem (i.e. as a monster drop)
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -3088,6 +3088,7 @@ AInventory *P_DropItem (AActor *source, const PClass *type, int dropamount, int
|
||||||
{
|
{
|
||||||
AInventory * inv = static_cast<AInventory *>(mo);
|
AInventory * inv = static_cast<AInventory *>(mo);
|
||||||
ModifyDropAmount(inv, dropamount);
|
ModifyDropAmount(inv, dropamount);
|
||||||
|
inv->ItemFlags |= IF_TOSSED;
|
||||||
if (inv->SpecialDropAction (source))
|
if (inv->SpecialDropAction (source))
|
||||||
{
|
{
|
||||||
// The special action indicates that the item should not spawn
|
// The special action indicates that the item should not spawn
|
||||||
|
|
|
@ -308,6 +308,7 @@ static FFlagDef InventoryFlags[] =
|
||||||
DEFINE_FLAG(IF, RESTRICTABSOLUTELY, AInventory, ItemFlags),
|
DEFINE_FLAG(IF, RESTRICTABSOLUTELY, AInventory, ItemFlags),
|
||||||
DEFINE_FLAG(IF, NEVERRESPAWN, AInventory, ItemFlags),
|
DEFINE_FLAG(IF, NEVERRESPAWN, AInventory, ItemFlags),
|
||||||
DEFINE_FLAG(IF, NOSCREENFLASH, AInventory, ItemFlags),
|
DEFINE_FLAG(IF, NOSCREENFLASH, AInventory, ItemFlags),
|
||||||
|
DEFINE_FLAG(IF, TOSSED, AInventory, ItemFlags),
|
||||||
|
|
||||||
DEFINE_DEPRECATED_FLAG(PICKUPFLASH),
|
DEFINE_DEPRECATED_FLAG(PICKUPFLASH),
|
||||||
DEFINE_DEPRECATED_FLAG(INTERHUBSTRIP),};
|
DEFINE_DEPRECATED_FLAG(INTERHUBSTRIP),};
|
||||||
|
|
Loading…
Reference in a new issue