Merge commit 'ec58178695' into scripting
Conflicts: src/p_enemy.cpp src/p_enemy.h wadsrc/static/actors/constants.txt (Scripting branch update part 1)
This commit is contained in:
commit
56989d3422
19 changed files with 170 additions and 58 deletions
|
|
@ -323,6 +323,7 @@ static FFlagDef InventoryFlags[] =
|
|||
DEFINE_FLAG(IF, NOSCREENFLASH, AInventory, ItemFlags),
|
||||
DEFINE_FLAG(IF, TOSSED, AInventory, ItemFlags),
|
||||
DEFINE_FLAG(IF, ALWAYSRESPAWN, AInventory, ItemFlags),
|
||||
DEFINE_FLAG(IF, TRANSFER, AInventory, ItemFlags),
|
||||
|
||||
DEFINE_DEPRECATED_FLAG(PICKUPFLASH),
|
||||
DEFINE_DEPRECATED_FLAG(INTERHUBSTRIP),};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue