From dfcd058c80db463c4564e1bc7db746e25cc7819e Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 21 Jan 2020 02:29:29 -0800
Subject: [PATCH] (BRUH MOMENT) activettscale was -1, so do recache after it's
set
---
src/f_finale.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/f_finale.c b/src/f_finale.c
index bc904d8f2..e37eab764 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -2693,8 +2693,18 @@ static void F_FigureActiveTtScale(void)
SINT8 newttscale = max(1, min(6, vid.dupx));
SINT8 oldttscale = activettscale;
- if (newttscale == testttscale)
- return;
+ if (needpatchrecache)
+ ttloaded[0] = ttloaded[1] = ttloaded[2] = ttloaded[3] = ttloaded[4] = ttloaded[5] = 0;
+ else
+ {
+ if (newttscale == testttscale)
+ return;
+
+ // We have a new ttscale, so load gfx
+ if(oldttscale > 0)
+ F_UnloadAlacroixGraphics(oldttscale);
+ }
+
testttscale = newttscale;
// If ttscale is unavailable: look for lower scales, then higher scales.
@@ -2712,10 +2722,6 @@ static void F_FigureActiveTtScale(void)
activettscale = (newttscale >= 1 && newttscale <= 6) ? newttscale : 0;
- // We have a new ttscale, so load gfx
- if(oldttscale > 0)
- F_UnloadAlacroixGraphics(oldttscale);
-
if(activettscale > 0)
F_LoadAlacroixGraphics(activettscale);
}
@@ -2757,12 +2763,6 @@ void F_TitleScreenDrawer(void)
return;
#endif
- if (needpatchrecache && (curttmode == TTMODE_ALACROIX))
- {
- ttloaded[0] = ttloaded[1] = ttloaded[2] = ttloaded[3] = ttloaded[4] = ttloaded[5] = 0;
- F_LoadAlacroixGraphics(activettscale);
- }
-
switch(curttmode)
{
case TTMODE_OLD:
--
GitLab