From 83390907f87de6a12ce4241df2f9a92f5cd69ee1 Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Sat, 1 Nov 2025 16:05:05 -0400 Subject: [PATCH] Preserve amps after truedeath --- src/g_game.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/g_game.c b/src/g_game.c index ed89ae538..ce69d80c0 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2337,6 +2337,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps) tic_t splits[MAXRACESPLITS]; + UINT8 amps; + INT32 i; // This needs to be first, to permit it to wipe extra information @@ -2503,6 +2505,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps) cangrabitems = 0; memset(&splits, 0, sizeof(splits)); + + amps = 0; } else { @@ -2565,6 +2569,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps) duelscore = players[player].duelscore; memcpy(&splits, &players[player].splits, sizeof(splits)); + + amps = players[player].amps; } spectatorReentry = (betweenmaps ? 0 : players[player].spectatorReentry); @@ -2715,6 +2721,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps) p->griefValue = griefValue; p->griefStrikes = griefStrikes; + p->amps = amps; + memcpy(&p->itemRoulette, &itemRoulette, sizeof (p->itemRoulette)); memcpy(&p->respawn, &respawn, sizeof (p->respawn));