Fixed seg fault in Doom64tc and propagated the fix to the other games.

skyjake · Aug 28, 2006 · d31a26d · d31a26d
1 parent 22c3afd
commit d31a26d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/doomsday/plugins/doom64tc/src/p_inter.c b/doomsday/plugins/doom64tc/src/p_inter.c
@@ -680,6 +680,9 @@ void P_KillMobj(mobj_t *source, mobj_t *target, boolean stomping)
     mobj_t *mo;
     angle_t angle;
 
+    if(!target) // nothing to kill
+        return;
+
     target->flags &= ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY);
 
     if(target->type != MT_SKULL)

diff --git a/doomsday/plugins/jdoom/src/p_inter.c b/doomsday/plugins/jdoom/src/p_inter.c
@@ -679,6 +679,9 @@ void P_KillMobj(mobj_t *source, mobj_t *target, boolean stomping)
     mobj_t *mo;
     angle_t angle;
 
+    if(!target) // nothing to kill
+        return;
+
     target->flags &= ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY);
 
     if(target->type != MT_SKULL)

diff --git a/doomsday/plugins/jheretic/src/p_inter.c b/doomsday/plugins/jheretic/src/p_inter.c
@@ -702,6 +702,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher)
 
 void P_KillMobj(mobj_t *source, mobj_t *target)
 {
+    if(!target) // nothing to kill
+        return;
+
     target->flags &= ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY | MF_NOGRAVITY);
     target->flags |= MF_CORPSE | MF_DROPOFF;
     target->flags2 &= ~MF2_PASSMOBJ;

diff --git a/doomsday/plugins/jhexen/src/p_inter.c b/doomsday/plugins/jhexen/src/p_inter.c
@@ -1190,6 +1190,9 @@ void P_KillMobj(mobj_t *source, mobj_t *target)
     int     dummy;
     mobj_t *master;
 
+    if(!target) // nothing to kill
+        return;
+
     target->flags &= ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY | MF_NOGRAVITY);
     target->flags |= MF_CORPSE | MF_DROPOFF;
     target->flags2 &= ~MF2_PASSMOBJ;

diff --git a/doomsday/plugins/wolftc/src/p_inter.c b/doomsday/plugins/wolftc/src/p_inter.c
@@ -981,6 +981,9 @@ void P_KillMobj(mobj_t *source, mobj_t *target, boolean stomping)
     mobj_t *mo;
     angle_t angle;
 
+    if(!target) // nothing to kill
+        return;
+
     target->flags &= ~(MF_SHOOTABLE | MF_FLOAT | MF_SKULLFLY);
 
     if(target->type != MT_SKULL)