zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-03 17:32:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renamed NODEATHJUMP to NODEATHDESELECT.

Browse source
This commit is contained in:
MajorCooke 2016-07-22 09:37:32 -05:00 committed by Christoph Oelckers
parent 797f3aec0a
commit 1322ef2449
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_shared/a_pickups.h
View file

@ -378,7 +378,7 @@ enum
WIF_MELEEWEAPON = 0x00008000, // melee weapon. Used by bots and monster AI. WIF_MELEEWEAPON = 0x00008000, // melee weapon. Used by bots and monster AI.
WIF_DEHAMMO = 0x00010000, // Uses Doom's original amount of ammo for the respective attack functions so that old DEHACKED patches work as intended. WIF_DEHAMMO = 0x00010000, // Uses Doom's original amount of ammo for the respective attack functions so that old DEHACKED patches work as intended.
// AmmoUse1 will be set to the first attack's ammo use so that checking for empty weapons still works // AmmoUse1 will be set to the first attack's ammo use so that checking for empty weapons still works
WIF_NODEATHJUMP = 0x00020000, // Don't jump to the Deselect state when the player dies WIF_NODEATHDESELECT = 0x00020000, // Don't jump to the Deselect state when the player dies
WIF_NODEATHINPUT = 0x00040000, // The weapon cannot be fired/reloaded/whatever when the player is dead WIF_NODEATHINPUT = 0x00040000, // The weapon cannot be fired/reloaded/whatever when the player is dead
WIF_CHEATNOTWEAPON = 0x08000000, // Give cheat considers this not a weapon (used by Sigil) WIF_CHEATNOTWEAPON = 0x08000000, // Give cheat considers this not a weapon (used by Sigil)

2
src/p_pspr.cpp
View file

@ -510,7 +510,7 @@ void P_DropWeapon (player_t *player)
} }
// Since the weapon is dropping, stop blocking switching. // Since the weapon is dropping, stop blocking switching.
player->WeaponState &= ~WF_DISABLESWITCH; player->WeaponState &= ~WF_DISABLESWITCH;
if ((player->ReadyWeapon != nullptr) && (player->health > 0 || !(player->ReadyWeapon->WeaponFlags & WIF_NODEATHJUMP))) if ((player->ReadyWeapon != nullptr) && (player->health > 0 || !(player->ReadyWeapon->WeaponFlags & WIF_NODEATHDESELECT)))
{ {
P_SetPsprite(player, PSP_WEAPON, player->ReadyWeapon->GetDownState()); P_SetPsprite(player, PSP_WEAPON, player->ReadyWeapon->GetDownState());
} }

2
src/thingdef/thingdef_data.cpp
View file

@ -362,7 +362,7 @@ static FFlagDef WeaponFlagDefs[] =
DEFINE_FLAG(WIF, NO_AUTO_SWITCH, AWeapon, WeaponFlags), DEFINE_FLAG(WIF, NO_AUTO_SWITCH, AWeapon, WeaponFlags),
DEFINE_FLAG(WIF, AMMO_CHECKBOTH, AWeapon, WeaponFlags), DEFINE_FLAG(WIF, AMMO_CHECKBOTH, AWeapon, WeaponFlags),
DEFINE_FLAG(WIF, NOAUTOAIM, AWeapon, WeaponFlags), DEFINE_FLAG(WIF, NOAUTOAIM, AWeapon, WeaponFlags),
DEFINE_FLAG(WIF, NODEATHJUMP, AWeapon, WeaponFlags), DEFINE_FLAG(WIF, NODEATHDESELECT, AWeapon, WeaponFlags),
DEFINE_FLAG(WIF, NODEATHINPUT, AWeapon, WeaponFlags), DEFINE_FLAG(WIF, NODEATHINPUT, AWeapon, WeaponFlags),
DEFINE_DUMMY_FLAG(NOLMS), DEFINE_DUMMY_FLAG(NOLMS),