From 92143f90fa7bfac8be7a6e0c145161da4f4e4d03 Mon Sep 17 00:00:00 2001 From: Edward Richardson Date: Sun, 16 Nov 2014 02:59:37 +1300 Subject: [PATCH] Yet another pointer --- src/p_interaction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index 7c88eb516f..4ee86d82c3 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -1370,7 +1370,7 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage, if (target->health <= 0) { - if ((target->flags7 & MF7_BUDDHA) && (damage < TELEFRAG_DAMAGE) && (!(inflictor->flags3 & MF7_FOILBUDDHA) && !(flags & DMG_FOILBUDDHA))) + if ((target->flags7 & MF7_BUDDHA) && (damage < TELEFRAG_DAMAGE) && ((inflictor == NULL || !(inflictor->flags3 & MF7_FOILBUDDHA)) && !(flags & DMG_FOILBUDDHA))) { //FOILBUDDHA or Telefrag damage must kill it. target->health = 1; }