Preserve amps after truedeath

This commit is contained in:
Antonio Martinez 2025-11-01 16:05:05 -04:00
parent d5785bc12a
commit 83390907f8

View file

@ -2337,6 +2337,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
tic_t splits[MAXRACESPLITS]; tic_t splits[MAXRACESPLITS];
UINT8 amps;
INT32 i; INT32 i;
// This needs to be first, to permit it to wipe extra information // 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; cangrabitems = 0;
memset(&splits, 0, sizeof(splits)); memset(&splits, 0, sizeof(splits));
amps = 0;
} }
else else
{ {
@ -2565,6 +2569,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
duelscore = players[player].duelscore; duelscore = players[player].duelscore;
memcpy(&splits, &players[player].splits, sizeof(splits)); memcpy(&splits, &players[player].splits, sizeof(splits));
amps = players[player].amps;
} }
spectatorReentry = (betweenmaps ? 0 : players[player].spectatorReentry); spectatorReentry = (betweenmaps ? 0 : players[player].spectatorReentry);
@ -2715,6 +2721,8 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
p->griefValue = griefValue; p->griefValue = griefValue;
p->griefStrikes = griefStrikes; p->griefStrikes = griefStrikes;
p->amps = amps;
memcpy(&p->itemRoulette, &itemRoulette, sizeof (p->itemRoulette)); memcpy(&p->itemRoulette, &itemRoulette, sizeof (p->itemRoulette));
memcpy(&p->respawn, &respawn, sizeof (p->respawn)); memcpy(&p->respawn, &respawn, sizeof (p->respawn));