From 3ddebabfa96423deb7d709780ef8540b0f955b92 Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 7 Mar 2022 01:37:32 +0000 Subject: [PATCH] Fix a followers invalid memory crash (discovered in this branch but likely existed beforehand). --- src/g_game.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index fd1b7c7d2..e2f82b336 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2249,8 +2249,11 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps) if (!(netgame || multiplayer)) pflags |= (players[player].pflags & (PF_GODMODE|PF_NOCLIP)); - // Obliterate follower from existence - P_SetTarget(&players[player].follower, NULL); + if (!betweenmaps) + { + // Obliterate follower from existence (if valid memory) + P_SetTarget(&players[player].follower, NULL); + } memcpy(&respawn, &players[player].respawn, sizeof (respawn));