From c5115c386cdf87b83a4531c4b7000843b344d5a0 Mon Sep 17 00:00:00 2001
From: Arthur <spaddlewit@gmail.com>
Date: Fri, 16 Feb 2024 19:08:01 -0500
Subject: [PATCH] cleanup
---
src/v_video.c | 5 +----
src/v_video.h | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/v_video.c b/src/v_video.c
index 304771a9dd..4ec3f49e49 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -3448,9 +3448,8 @@ INT32 V_StringHeight(const char *string, INT32 option)
{
INT32 x = 0;
INT32 y = 0;
- INT32 w, c, cx = x, cy = y, center = 0;
+ INT32 w, c, cx = x, cy = y;
const char *ch = string;
- INT32 charflags = (option & V_CHARCOLORMASK);
INT32 spacewidth = 4, charwidth = 0;
INT32 lowercase = (option & V_ALLOWLOWERCASE);
@@ -3484,8 +3483,6 @@ INT32 V_StringHeight(const char *string, INT32 option)
if (*ch & 0x80) //color parsing -x 2.16.09
{
// manually set flags override color codes
- if (!(option & V_CHARCOLORMASK))
- charflags = ((*ch & 0x7f) << V_CHARCOLORSHIFT) & V_CHARCOLORMASK;
continue;
}
if (*ch == '\n')
diff --git a/src/v_video.h b/src/v_video.h
index c440e6978b..431774624f 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -257,7 +257,7 @@ INT16 V_LevelActNumWidth(UINT8 num); // act number width
void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string);
INT32 V_CreditStringWidth(const char *string);
-INT32 V_CreditStringHeight(const char *string, INT32 option);
+INT32 V_CreditStringHeight(const char *string);
// Draw a string using the nt_font
void V_DrawNameTag(INT32 x, INT32 y, INT32 option, fixed_t scale, UINT8 *basecolormap, UINT8 *outlinecolormap, const char *string);
--
GitLab