From 814cb4d13553530f1a3c41d39abc40c988d5b42a Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Thu, 3 Jan 2013 03:05:44 +0000
Subject: [PATCH] - Move NULL player check earlier in P_PoisonDamage, before
 player is accessed.

SVN r4016 (trunk)
---
 src/p_interaction.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp
index b98c1d3cf5..66bdbe2a2c 100644
--- a/src/p_interaction.cpp
+++ b/src/p_interaction.cpp
@@ -1556,6 +1556,10 @@ void P_PoisonDamage (player_t *player, AActor *source, int damage,
 	AActor *target;
 	AActor *inflictor;
 
+	if (player == NULL)
+	{
+		return;
+	}
 	target = player->mo;
 	inflictor = source;
 	if (target->health <= 0)
@@ -1567,11 +1571,8 @@ void P_PoisonDamage (player_t *player, AActor *source, int damage,
 	{ // target is invulnerable
 		return;
 	}
-	if (player)
-	{
-		// Take half damage in trainer mode
-		damage = FixedMul(damage, G_SkillProperty(SKILLP_DamageFactor));
-	}
+	// Take half damage in trainer mode
+	damage = FixedMul(damage, G_SkillProperty(SKILLP_DamageFactor));
 	// Handle passive damage modifiers (e.g. PowerProtection)
 	if (target->Inventory != NULL)
 	{