From df785e16519fa1d76c1925577df19d8dbbe845a5 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sun, 27 Oct 2019 17:20:43 +0000
Subject: [PATCH] * Add alternate numerical drawer for continues on
Intermission screen if there's > 5. * Tweak offsets on Continue screen
numerical continue drawer to match.
---
src/f_finale.c | 4 ++--
src/y_inter.c | 20 ++++++++++++++++----
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/f_finale.c b/src/f_finale.c
index eb1415042b..9d0d7892ef 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -2586,8 +2586,8 @@ void F_ContinueDrawer(void)
{
if (!(continuetime & 1) || continuetime > 17)
V_DrawContinueIcon(x, 68, 0, players[consoleplayer].skin, players[consoleplayer].skincolor);
- V_DrawScaledPatch(x+12, 68-2, 0, stlivex);
- V_DrawRightAlignedString(x+36, 69-5, 0,
+ V_DrawScaledPatch(x+12, 66, 0, stlivex);
+ V_DrawRightAlignedString(x+38, 64, 0,
va("%d",(imcontinuing ? ncontinues-1 : ncontinues)));
}
else
diff --git a/src/y_inter.c b/src/y_inter.c
index 2fed35de30..c9ab564ba4 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -425,11 +425,23 @@ void Y_IntermissionDrawer(void)
UINT8 continues = data.spec.continues & 0x7F;
V_DrawScaledPatch(152 + xoffset5, 150+yoffset, 0, data.spec.pcontinues);
- for (i = 0; i < continues; ++i)
+ if (continues > 5)
{
- if ((data.spec.continues & 0x80) && i == continues-1 && (endtic < 0 || intertic%20 < 10))
- break;
- V_DrawContinueIcon(246 + xoffset5 - (i*20), 162+yoffset, 0, *data.spec.playerchar, *data.spec.playercolor);
+ INT32 leftx = (continues >= 10) ? 216 : 224;
+ V_DrawContinueIcon(leftx + xoffset5, 162+yoffset, 0, *data.spec.playerchar, *data.spec.playercolor);
+ V_DrawScaledPatch(leftx + xoffset5 + 12, 160+yoffset, 0, stlivex);
+ if (!((data.spec.continues & 0x80) && !(endtic < 0 || intertic%20 < 10)))
+ V_DrawRightAlignedString(252 + xoffset5, 158+yoffset, 0,
+ va("%d",(((data.spec.continues & 0x80) && (endtic < 0)) ? continues-1 : continues)));
+ }
+ else
+ {
+ for (i = 0; i < continues; ++i)
+ {
+ if ((data.spec.continues & 0x80) && i == continues-1 && (endtic < 0 || intertic%20 < 10))
+ break;
+ V_DrawContinueIcon(246 + xoffset5 - (i*20), 162+yoffset, 0, *data.spec.playerchar, *data.spec.playercolor);
+ }
}
}
}
--
GitLab