From 0a1beab8c80591a90107017b0d0712f74ecba720 Mon Sep 17 00:00:00 2001
From: Riku Salminen <38985578+Riku-S@users.noreply.github.com>
Date: Sat, 14 Nov 2020 20:17:35 +0200
Subject: [PATCH] Reset a couple of other variables while we're at it
---
src/g_game.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/g_game.c b/src/g_game.c
index 528721e2fc..d6861b252f 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -2216,12 +2216,32 @@ void G_Ticker(boolean run)
// Costs a life to retry ... unless the player in question is dead already, or you haven't even touched the first starpost in marathon run.
if (marathonmode && gamemap == spmarathon_start && !players[consoleplayer].starposttime)
{
+ player_t *p = &players[consoleplayer];
marathonmode |= MA_INIT;
marathontime = 0;
- tokenlist = 0;
- token = 0;
- emeralds = 0;
+ numgameovers = tokenlist = token = 0;
+ countdown = countdown2 = exitfadestarted = 0;
+
+ p->playerstate = PST_REBORN;
+ p->starpostx = p->starposty = p->starpostz = 0;
+
+ p->lives = startinglivesbalance[0];
+ p->continues = 1;
+
+ p->score = 0;
+
+ // The latter two should clear by themselves, but just in case
+ p->pflags &= ~(PF_TAGIT|PF_GAMETYPEOVER|PF_FULLSTASIS);
+
+ // Clear cheatcodes too, just in case.
+ p->pflags &= ~(PF_GODMODE|PF_NOCLIP|PF_INVIS);
+
+ p->xtralife = 0;
+
+ // Reset unlockable triggers
+ unlocktriggers = 0;
+
}
else if (G_GametypeUsesLives() && players[consoleplayer].playerstate == PST_LIVE && players[consoleplayer].lives != INFLIVES)
players[consoleplayer].lives -= 1;
--
GitLab