From 8c1c0875a2f8dd545920cf7dc7c9bd59af2d43ae Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Mon, 25 Mar 2019 21:35:04 +0000
Subject: [PATCH] Fix credits gamestate in dedicated mode, by properly
separating the timer variable code from the drawing code in a semi-hacky way
---
src/f_finale.c | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/f_finale.c b/src/f_finale.c
index 64e371211..bcdac295a 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1192,16 +1192,34 @@ void F_CreditDrawer(void)
if (FixedMul(y,vid.dupy) > vid.height)
break;
}
+}
+
+void F_CreditTicker(void)
+{
+ // "Simulate" the drawing of the credits so that dedicated mode doesn't get stuck
+ UINT16 i;
+ fixed_t y = (80<<FRACBITS) - 5*(animtimer<<FRACBITS)/8;
+ // Draw credits text on top
+ for (i = 0; credits[i]; i++)
+ {
+ switch(credits[i][0])
+ {
+ case 0: y += 80<<FRACBITS; break;
+ case 1: y += 30<<FRACBITS; break;
+ default: y += 12<<FRACBITS; break;
+ }
+ if (FixedMul(y,vid.dupy) > vid.height)
+ break;
+ }
+
+ // Do this here rather than in the drawer you doofus! (this is why dedicated mode broke at credits)
if (!credits[i] && y <= 120<<FRACBITS && !finalecount)
{
timetonext = 5*TICRATE+1;
finalecount = 5*TICRATE;
}
-}
-void F_CreditTicker(void)
-{
if (timetonext)
timetonext--;
else
--
GitLab