From e1a217dc105d568fb1ef76ee124b5d3636dbf3b2 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sun, 12 Jul 2020 13:00:08 +0100
Subject: [PATCH] Two minor fixes for Marathon Mode. * Apply the RTA penalty to
the live event backup rather than the current timer. (Resolves #184) * Snap
the character name and timer mode text to the bottom of the screen, just
above the bar.
---
src/f_finale.c | 2 +-
src/g_game.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/f_finale.c b/src/f_finale.c
index f47c6c1a7..8d39a7533 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1684,7 +1684,7 @@ void F_GameEvaluationDrawer(void)
endingtext = va("%s & %s, %s%s", skins[players[consoleplayer].skin].realname, skins[botskin-1].realname, rtatext, cuttext);
else
endingtext = va("%s, %s%s", skins[players[consoleplayer].skin].realname, rtatext, cuttext);
- V_DrawCenteredString(BASEVIDWIDTH/2, 182, (ultimatemode ? V_REDMAP : V_YELLOWMAP), endingtext);
+ V_DrawCenteredString(BASEVIDWIDTH/2, 182, V_SNAPTOBOTTOM|(ultimatemode ? V_REDMAP : V_YELLOWMAP), endingtext);
}
}
diff --git a/src/g_game.c b/src/g_game.c
index 69aac5065..cce4ac822 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4505,7 +4505,7 @@ void G_SaveGame(UINT32 slot, INT16 mapnum)
{
UINT32 writetime = marathontime;
if (!(marathonmode & MA_INGAME))
- marathontime += TICRATE*5; // live event backup penalty because we don't know how long it takes to get to the next map
+ writetime += TICRATE*5; // live event backup penalty because we don't know how long it takes to get to the next map
WRITEUINT32(save_p, writetime);
WRITEUINT8(save_p, (marathonmode & ~MA_INIT));
}
--
GitLab