From 1322ef24493226c81d8b264ab82bcc887b8a3c8e Mon Sep 17 00:00:00 2001 From: MajorCooke Date: Fri, 22 Jul 2016 09:37:32 -0500 Subject: [PATCH] Renamed NODEATHJUMP to NODEATHDESELECT. --- src/g_shared/a_pickups.h | 2 +- src/p_pspr.cpp | 2 +- src/thingdef/thingdef_data.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/g_shared/a_pickups.h b/src/g_shared/a_pickups.h index af0135bc2..0023cd271 100644 --- a/src/g_shared/a_pickups.h +++ b/src/g_shared/a_pickups.h @@ -378,7 +378,7 @@ enum 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. // 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_CHEATNOTWEAPON = 0x08000000, // Give cheat considers this not a weapon (used by Sigil) diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 70355a0f9..350acc3fd 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -510,7 +510,7 @@ void P_DropWeapon (player_t *player) } // Since the weapon is dropping, stop blocking switching. 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()); } diff --git a/src/thingdef/thingdef_data.cpp b/src/thingdef/thingdef_data.cpp index dc4587cfb..fba032662 100644 --- a/src/thingdef/thingdef_data.cpp +++ b/src/thingdef/thingdef_data.cpp @@ -362,7 +362,7 @@ static FFlagDef WeaponFlagDefs[] = DEFINE_FLAG(WIF, NO_AUTO_SWITCH, AWeapon, WeaponFlags), DEFINE_FLAG(WIF, AMMO_CHECKBOTH, 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_DUMMY_FLAG(NOLMS),