zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-27 14:22:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Players are no longer affected by the skill property NoPain.

Browse source 
SVN r3654 (trunk)
This commit is contained in:
Randy Heit 2012-05-15 21:51:02 +00:00
parent d6cd9b430d
commit cbebc12fd0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_level.h
View file

@ -401,7 +401,7 @@ struct FLevelLocals
int musicorder;
int cdtrack;
unsigned int cdid;
int nextmusic; // For MUSINFO purposes
int nextmusic; // For MUSINFO purposes
char skypic1[9];
char skypic2[9];

2
src/p_interaction.cpp
View file

@ -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)) &&
!G_SkillProperty(SKILLP_NoPain) && !(target->flags & MF_SKULLFLY))
(target->player != NULL || !G_SkillProperty(SKILLP_NoPain)) && !(target->flags & MF_SKULLFLY))
{
pc = target->GetClass()->ActorInfo->PainChances;
painchance = target->PainChance;