shithub: choc

Info  •  Files  •  Log  •  Branches

Don't crash Heretic in A_SkullPop() if a player is gibbed and respawns
before the head separates from the body (thanks Tumlee).

Subversion-branch: /branches/v2-branch
Subversion-revision: 2720

--- a/src/heretic/p_enemy.c

+++ b/src/heretic/p_enemy.c

@@ -2567,9 +2567,17 @@

     mo->player = player;

     mo->health = actor->health;

     mo->angle = actor->angle;

-    player->mo = mo;

-    player->lookdir = 0;

-    player->damagecount = 32;

+

+    // fraggle: This check wasn't originally here in the Vanilla Heretic

+    // source, causing crashes if the player respawns before this

+    // function is called.

+

+    if (player != NULL)

+    {

+        player->mo = mo;

+        player->lookdir = 0;

+        player->damagecount = 32;

+    }

 }

 //----------------------------------------------------------------------------