mirror of https://github.com/ZDoom/qzdoom.git
- Players are no longer affected by the skill property NoPain.
SVN r3654 (trunk)
This commit is contained in:
parent
d6cd9b430d
commit
cbebc12fd0
|
@ -401,7 +401,7 @@ struct FLevelLocals
|
||||||
int musicorder;
|
int musicorder;
|
||||||
int cdtrack;
|
int cdtrack;
|
||||||
unsigned int cdid;
|
unsigned int cdid;
|
||||||
int nextmusic; // For MUSINFO purposes
|
int nextmusic; // For MUSINFO purposes
|
||||||
char skypic1[9];
|
char skypic1[9];
|
||||||
char skypic2[9];
|
char skypic2[9];
|
||||||
|
|
||||||
|
|
|
@ -1311,7 +1311,7 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
|
||||||
|
|
||||||
|
|
||||||
if (!(target->flags5 & MF5_NOPAIN) && (inflictor == NULL || !(inflictor->flags5 & MF5_PAINLESS)) &&
|
if (!(target->flags5 & MF5_NOPAIN) && (inflictor == NULL || !(inflictor->flags5 & MF5_PAINLESS)) &&
|
||||||
!G_SkillProperty(SKILLP_NoPain) && !(target->flags & MF_SKULLFLY))
|
(target->player != NULL || !G_SkillProperty(SKILLP_NoPain)) && !(target->flags & MF_SKULLFLY))
|
||||||
{
|
{
|
||||||
pc = target->GetClass()->ActorInfo->PainChances;
|
pc = target->GetClass()->ActorInfo->PainChances;
|
||||||
painchance = target->PainChance;
|
painchance = target->PainChance;
|
||||||
|
|
Loading…
Reference in New Issue