mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-28 06:53:58 +00:00
- fixed: The internal and scripted morph flags did not match.
This commit is contained in:
parent
346ada76bc
commit
24a505ed36
1 changed files with 17 additions and 14 deletions
|
@ -214,20 +214,23 @@ enum ESelectWeaponFlags
|
||||||
// Morph constants
|
// Morph constants
|
||||||
enum EMorphFlags
|
enum EMorphFlags
|
||||||
{
|
{
|
||||||
MRF_ADDSTAMINA = 1,
|
MRF_OLDEFFECTS = 0x00000000,
|
||||||
MRF_FULLHEALTH = 2,
|
MRF_ADDSTAMINA = 0x00000001,
|
||||||
MRF_UNDOBYTOMEOFPOWER = 4,
|
MRF_FULLHEALTH = 0x00000002,
|
||||||
MRF_UNDOBYCHAOSDEVICE = 8,
|
MRF_UNDOBYTOMEOFPOWER = 0x00000004,
|
||||||
MRF_FAILNOTELEFRAG = 16,
|
MRF_UNDOBYCHAOSDEVICE = 0x00000008,
|
||||||
MRF_FAILNOLAUGH = 32,
|
MRF_FAILNOTELEFRAG = 0x00000010,
|
||||||
MRF_WHENINVULNERABLE = 64,
|
MRF_FAILNOLAUGH = 0x00000020,
|
||||||
MRF_LOSEACTUALWEAPON = 128,
|
MRF_WHENINVULNERABLE = 0x00000040,
|
||||||
MRF_NEWTIDBEHAVIOUR = 256,
|
MRF_LOSEACTUALWEAPON = 0x00000080,
|
||||||
MRF_UNDOBYDEATH = 512,
|
MRF_NEWTIDBEHAVIOUR = 0x00000100,
|
||||||
MRF_UNDOBYDEATHFORCED = 1024,
|
MRF_UNDOBYDEATH = 0x00000200,
|
||||||
MRF_UNDOBYDEATHSAVES = 2048,
|
MRF_UNDOBYDEATHFORCED = 0x00000400,
|
||||||
MRF_UNDOALWAYS = 4096,
|
MRF_UNDOBYDEATHSAVES = 0x00000800,
|
||||||
MRF_TRANSFERTRANSLATION = 8192,
|
MRF_UNDOBYTIMEOUT = 0x00001000,
|
||||||
|
MRF_UNDOALWAYS = 0x00002000,
|
||||||
|
MRF_TRANSFERTRANSLATION = 0x00004000,
|
||||||
|
MRF_STANDARDUNDOING = MORPH_UNDOBYTOMEOFPOWER | MORPH_UNDOBYCHAOSDEVICE | MORPH_UNDOBYTIMEOUT,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Flags for A_RailAttack and A_CustomRailgun
|
// Flags for A_RailAttack and A_CustomRailgun
|
||||||
|
|
Loading…
Reference in a new issue