From cbebc12fd0bf539383acbf35fbcf8cfa94778d77 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Tue, 15 May 2012 21:51:02 +0000
Subject: [PATCH] - Players are no longer affected by the skill property
 NoPain.

SVN r3654 (trunk)
---
 src/g_level.h         | 2 +-
 src/p_interaction.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/g_level.h b/src/g_level.h
index 10dc15eb8..74df29ea3 100644
--- a/src/g_level.h
+++ b/src/g_level.h
@@ -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];
 
diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index 955f1eec3..538581327 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -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;