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

- Fixed monsters waking up even if all the damage was absorbed without pain causing flags

Browse source 
- Fixed FORCEPAIN not overriding PainThreshold property
This commit is contained in:
Major Cooke 2019-02-15 10:02:59 -06:00 committed by Christoph Oelckers
parent 769be00483
commit 823eb90af8
1 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/p_interaction.cpp
View file

@ -810,6 +810,7 @@ static void ReactToDamage(AActor *target, AActor *inflictor, AActor *source, int
bool fakedPain = false; bool fakedPain = false;
bool forcedPain = false; bool forcedPain = false;
bool noPain = false; bool noPain = false;
bool wakeup = false;
// Dead or non-existent entity, do not react. Especially if the damage is cancelled. // Dead or non-existent entity, do not react. Especially if the damage is cancelled.
if (target == nullptr || target->health < 1 || damage < 0) if (target == nullptr || target->health < 1 || damage < 0)
@ -823,22 +824,8 @@ static void ReactToDamage(AActor *target, AActor *inflictor, AActor *source, int
return; return;
} }
noPain = (flags & DMG_NO_PAIN) || (target->flags5 & MF5_NOPAIN) || (inflictor && (inflictor->flags5 & MF5_PAINLESS));
// Are we attempting to cause pain?
if (!noPain)
{
fakedPain = (isFakePain(target, inflictor, originaldamage));
forcedPain = (MustForcePain(target, inflictor));
}
// [MC] No forced or faked pain so skip it.
// However the rest of the function must carry on.
if (!noPain && damage < 1 && !fakedPain && !forcedPain)
noPain = true;
woundstate = target->FindState(NAME_Wound, mod); woundstate = target->FindState(NAME_Wound, mod);
if (woundstate != NULL) if (woundstate != nullptr)
{ {
int woundhealth = target->WoundHealth; int woundhealth = target->WoundHealth;
@ -848,10 +835,16 @@ static void ReactToDamage(AActor *target, AActor *inflictor, AActor *source, int
return; return;
} }
} }
// [MC] NOPAIN will not stop the actor from waking up if damaged.
// ALLOW/CAUSEPAIN will enable infighting, even if painless.
noPain = (flags & DMG_NO_PAIN) || (target->flags5 & MF5_NOPAIN) || (inflictor && (inflictor->flags5 & MF5_PAINLESS));
fakedPain = (isFakePain(target, inflictor, originaldamage));
forcedPain = (MustForcePain(target, inflictor));
wakeup = (damage > 0 || fakedPain || forcedPain);
if (!noPain && if (!noPain && wakeup &&
((target->player != nullptr || !G_SkillProperty(SKILLP_NoPain)) && !(target->flags & MF_SKULLFLY)) ((target->player != nullptr || !G_SkillProperty(SKILLP_NoPain)) && !(target->flags & MF_SKULLFLY))
&& damage >= target->PainThreshold) && (forcedPain || damage >= target->PainThreshold))
{ {
if (inflictor && inflictor->PainType != NAME_None) if (inflictor && inflictor->PainType != NAME_None)
mod = inflictor->PainType; mod = inflictor->PainType;
@ -860,13 +853,13 @@ static void ReactToDamage(AActor *target, AActor *inflictor, AActor *source, int
justhit = TriggerPainChance(target, mod, forcedPain, false); justhit = TriggerPainChance(target, mod, forcedPain, false);
} }
if (target->player == nullptr) target->reactiontime = 0; // we're awake now... if (wakeup && target->player == nullptr) target->reactiontime = 0; // we're awake now...
if (source) if (wakeup && source)
{ {
if (source == target->target) if (source == target->target)
{ {
target->threshold = target->DefThreshold; target->threshold = target->DefThreshold;
if (target->state == target->SpawnState && target->SeeState != NULL) if (target->state == target->SpawnState && target->SeeState != nullptr)
{ {
target->SetState(target->SeeState); target->SetState(target->SeeState);
} }
@ -879,15 +872,15 @@ static void ReactToDamage(AActor *target, AActor *inflictor, AActor *source, int
// killough 2/15/98: remember last enemy, to prevent // killough 2/15/98: remember last enemy, to prevent
// sleeping early; 2/21/98: Place priority on players // sleeping early; 2/21/98: Place priority on players
if (target->lastenemy == NULL || if (target->lastenemy == nullptr ||
(target->lastenemy->player == NULL && target->TIDtoHate == 0) || (target->lastenemy->player == nullptr && target->TIDtoHate == 0) ||
target->lastenemy->health <= 0) target->lastenemy->health <= 0)
{ {
target->lastenemy = target->target; // remember last enemy - killough target->lastenemy = target->target; // remember last enemy - killough
} }
target->target = source; target->target = source;
target->threshold = target->DefThreshold; target->threshold = target->DefThreshold;
if (target->state == target->SpawnState && target->SeeState != NULL) if (target->state == target->SpawnState && target->SeeState != nullptr)
{ {
target->SetState(target->SeeState); target->SetState(target->SeeState);
} }