src/st_stuff.c

@@ -897,7 +897,7 @@ static void ST_drawLivesArea(void)
 
 		if (livescount == INFLIVES)
 			V_DrawCharacter(hudinfo[HUD_LIVES].x+50, hudinfo[HUD_LIVES].y+8,
-				'\x16' | 0x80 | hudinfo[HUD_LIVES].f|V_PERPLAYER|V_HUDTRANS, false);
+				'\x16', 0x80 | hudinfo[HUD_LIVES].f|V_PERPLAYER|V_HUDTRANS, false);
 		else
 		{
 			if (stplyr->playerstate == PST_DEAD && !(stplyr->spectator) && (livescount || stplyr->deadtimer < (TICRATE<<1)))
@@ -1105,7 +1105,7 @@ static void ST_drawInput(void)
 		V_DrawFill(x+16+(xoffs), y+9+(yoffs), 10, 1, hudinfo[HUD_LIVES].f|29);\
 	}\
 	V_DrawFill(x+16+(xoffs), y+(yoffs)-offs, 10, 10, col);\
-	V_DrawCharacter(x+16+1+(xoffs), y+1+(yoffs)-offs, hudinfo[HUD_LIVES].f|symb, false)
+	V_DrawCharacter(x+16+1+(xoffs), y+1+(yoffs)-offs, symb, hudinfo[HUD_LIVES].f, false)
 
 	drawbutt( 4,-3, BT_JUMP, 'J');
 	drawbutt(15,-3, BT_USE,  'S');

src/v_video.c

@@ -2000,17 +2000,19 @@ UINT8 *V_GetStringColormap(INT32 colorflags)
 
 // Writes a single character (draw WHITE if bit 7 set)
 //
-void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed)
+void V_DrawCharacter(INT32 x, INT32 y, INT32 c, INT32 eflags, boolean lowercaseallowed)
 {
 	INT32 w, flags;
-	const UINT8 *colormap = V_GetStringColormap(c);
+	const UINT8 *colormap = V_GetStringColormap(eflags);
 
-	flags = c & ~(V_CHARCOLORMASK | V_PARAMMASK);
+	flags = eflags & ~(V_CHARCOLORMASK | V_PARAMMASK);
+	if (c < HU_FONTEXT)
 		c &= 0x7f;
 	if (lowercaseallowed)
 		c -= HU_FONTSTART;
 	else
-		c = toupper(c) - HU_FONTSTART;
+		c = V_CharUppercase(c) - HU_FONTSTART;
+
 	if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
 		return;
 
@@ -2027,17 +2029,19 @@ void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed)
 // Writes a single character for the chat. (draw WHITE if bit 7 set)
 // Essentially the same as the above but it's small or big depending on what resolution you've chosen to huge..
 //
-void V_DrawChatCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed, UINT8 *colormap)
+void V_DrawChatCharacter(INT32 x, INT32 y, INT32 c, INT32 eflags, boolean lowercaseallowed, UINT8 *colormap)
 {
 	INT32 w, flags;
-	//const UINT8 *colormap = V_GetStringColormap(c);
+	//const UINT8 *colormap = V_GetStringColormap(eflags);
 
-	flags = c & ~(V_CHARCOLORMASK | V_PARAMMASK);
+	flags = eflags & ~(V_CHARCOLORMASK | V_PARAMMASK);
+	if (c < HU_FONTEXT)
 		c &= 0x7f;
 	if (lowercaseallowed)
 		c -= HU_FONTSTART;
 	else
-		c = toupper(c) - HU_FONTSTART;
+		c = V_CharUppercase(c) - HU_FONTSTART;
+
 	if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
 		return;
 
@@ -2046,8 +2050,6 @@ void V_DrawChatCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed, UI
 		return;
 
 	V_DrawFixedPatch(x*FRACUNIT, y*FRACUNIT, (vid.width < 640) ? (FRACUNIT) : (FRACUNIT/2), flags, hu_font[c], colormap);
-
-
 }
 
 // Precompile a wordwrapped string to any given width.
@@ -2084,7 +2086,7 @@ char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 	for (i = 0; i < slen; ++i)
 	{
 		c = newstring[i];
-		if ((UINT8)c & 0x80) //color parsing! -Inuyasha 2.16.09
+		if (HU_IsColorCode((UINT8)c)) //color parsing! -Inuyasha 2.16.09
 			continue;
 
 		if (c == '\n')
@@ -2095,7 +2097,7 @@ char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 		}
 
 		if (!(option & V_ALLOWLOWERCASE))
-			c = toupper(c);
+			c = V_CharUppercase(c);
 		c -= HU_FONTSTART;
 
 		if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
@@ -2119,6 +2121,27 @@ char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 	return newstring;
 }
 
+// Lactozilla
+UINT8 V_CharUppercase(UINT8 chr)
+{
+	// No uppercase variant of this character
+	// At least, not in Latin-1 Supplement
+	// But it's present Latin Extended-A
+	// Though it can't fit in a single byte
+	if (chr == 0xFF) // "Latin Small Letter Y with diaeresis"
+		return chr;
+	// No uppercase variant of these characters
+	// "Latin Small Letter sharp S", "Multiplication sign" and "Division sign"
+	if (chr == 0xDF || chr == 0xD7 || chr == 0xF7)
+		return chr;
+	// U+00C0 to U+00FE
+	// Lowercase characters start at U+00E0
+	// "Latin Small Letter A with grave" and "Latin Small Letter Thorn"
+	if (chr >= 0xE0 && chr <= 0xFE)
+		return chr - 32;
+	return (UINT8)toupper((char)chr);
+}
+
 //
 // Write a string using the hu_font
 // NOTE: the text is centered for screens larger than the base width
@@ -2126,7 +2149,7 @@ char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
 {
 	INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth, center = 0, left = 0;
-	const char *ch = string;
+	const UINT8 *ch = (const UINT8 *)string;
 	INT32 charflags = (option & V_CHARCOLORMASK);
 	const UINT8 *colormap = NULL;
 	INT32 spacewidth = 4, charwidth = 0;
@@ -2166,7 +2189,7 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
 	{
 		if (!*ch)
 			break;
-		if (*ch & 0x80) //color parsing -x 2.16.09
+		if (HU_IsColorCode(*ch)) //color parsing -x 2.16.09
 		{
 			// manually set flags override color codes
 			if (!(option & V_CHARCOLORMASK))
@@ -2187,7 +2210,7 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
 
 		c = *ch;
 		if (!lowercase)
-			c = toupper(c);
+			c = V_CharUppercase(c);
 		c -= HU_FONTSTART;
 
 		// character does not exist or is a space
@@ -2281,7 +2304,7 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
 	{
 		if (!*ch)
 			break;
-		if (*ch & 0x80) //color parsing -x 2.16.09
+		if (HU_IsColorCode(*ch)) //color parsing -x 2.16.09
 		{
 			// manually set flags override color codes
 			if (!(option & V_CHARCOLORMASK))
@@ -2302,7 +2325,7 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
 
 		c = *ch;
 		if (!lowercase)
-			c = toupper(c);
+			c = V_CharUppercase(c);
 		c -= HU_FONTSTART;
 
 		if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
@@ -2389,7 +2412,7 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
 	{
 		if (!*ch)
 			break;
-		if (*ch & 0x80) //color parsing -x 2.16.09
+		if (HU_IsColorCode(*ch)) //color parsing -x 2.16.09
 		{
 			// manually set flags override color codes
 			if (!(option & V_CHARCOLORMASK))
@@ -2410,7 +2433,7 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
 
 		c = *ch;
 		if (!lowercase || !tny_font[c-HU_FONTSTART])
-			c = toupper(c);
+			c = V_CharUppercase(c);
 		c -= HU_FONTSTART;
 
 		if (c < 0 || c >= HU_FONTSIZE || !tny_font[c])
@@ -2492,7 +2515,7 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
 	{
 		if (!*ch)
 			break;
-		if (*ch & 0x80) //color ignoring
+		if (HU_IsColorCode(*ch)) //color ignoring
 		{
 			// manually set flags override color codes
 			if (!(option & V_CHARCOLORMASK))
@@ -2513,7 +2536,7 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
 
 		c = *ch;
 		if (!lowercase)
-			c = toupper(c);
+			c = V_CharUppercase(c);
 		c -= HU_FONTSTART;
 
 		// character does not exist or is a space
@@ -2636,7 +2659,7 @@ void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string)
 			continue;
 		}
 
-		c = toupper(c) - CRED_FONTSTART;
+		c = V_CharUppercase(c) - CRED_FONTSTART;
 		if (c < 0 || c >= CRED_FONTSIZE)
 		{
 			cx += (16*dupx)<<FRACBITS;
@@ -2692,7 +2715,7 @@ static void V_DrawNameTagLine(INT32 x, INT32 y, INT32 option, fixed_t scale, UIN
 			continue;
 		}
 
-		c = toupper(*ch);
+		c = V_CharUppercase(*ch);
 		c -= NT_FONTSTART;
 
 		// character does not exist or is a space
@@ -2839,7 +2862,7 @@ INT32 V_NameTagWidth(const char *string)
 
 	for (i = 0; i < strlen(string); i++)
 	{
-		c = toupper(string[i]) - NT_FONTSTART;
+		c = V_CharUppercase(string[i]) - NT_FONTSTART;
 		if (c < 0 || c >= NT_FONTSIZE || !ntb_font[c] || !nto_font[c])
 			w += 4;
 		else
@@ -2862,7 +2885,7 @@ INT32 V_CreditStringWidth(const char *string)
 
 	for (i = 0; i < strlen(string); i++)
 	{
-		c = toupper(string[i]) - CRED_FONTSTART;
+		c = V_CharUppercase(string[i]) - CRED_FONTSTART;
 		if (c < 0 || c >= CRED_FONTSIZE)
 			w += 16;
 		else
@@ -2900,7 +2923,7 @@ void V_DrawLevelTitle(INT32 x, INT32 y, INT32 option, const char *string)
 	{
 		if (!*ch)
 			break;
-		if (*ch & 0x80) //color parsing -x 2.16.09
+		if (HU_IsColorCode(*ch)) //color parsing -x 2.16.09
 		{
 			// manually set flags override color codes
 			if (!(option & V_CHARCOLORMASK))
@@ -2947,7 +2970,7 @@ INT32 V_LevelNameWidth(const char *string)
 
 	for (i = 0; i < strlen(string); i++)
 	{
-		if (string[i] & 0x80)
+		if (HU_IsColorCode(string[i]))
 			continue;
 		c = string[i] - LT_FONTSTART;
 		if (c < 0 || c >= LT_FONTSIZE || !lt_font[c])
@@ -3014,9 +3037,9 @@ INT32 V_StringWidth(const char *string, INT32 option)
 
 	for (i = 0; i < strlen(string); i++)
 	{
-		if (string[i] & 0x80)
+		if (HU_IsColorCode(string[i]))
 			continue;
-		c = toupper(string[i]) - HU_FONTSTART;
+		c = V_CharUppercase(string[i]) - HU_FONTSTART;
 		if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
 			w += spacewidth;
 		else
@@ -3054,9 +3077,9 @@ INT32 V_SmallStringWidth(const char *string, INT32 option)
 
 	for (i = 0; i < strlen(string); i++)
 	{
-		if (string[i] & 0x80)
+		if (HU_IsColorCode(string[i]))
 			continue;
-		c = toupper(string[i]) - HU_FONTSTART;
+		c = V_CharUppercase(string[i]) - HU_FONTSTART;
 		if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
 			w += spacewidth;
 		else
@@ -3091,9 +3114,9 @@ INT32 V_ThinStringWidth(const char *string, INT32 option)
 
 	for (i = 0; i < strlen(string); i++)
 	{
-		if (string[i] & 0x80)
+		if (HU_IsColorCode(string[i]))
 			continue;
-		c = toupper(string[i]) - HU_FONTSTART;
+		c = V_CharUppercase(string[i]) - HU_FONTSTART;
 		if (c < 0 || c >= HU_FONTSIZE || !tny_font[c])
 			w += spacewidth;
 		else

src/v_video.h

@@ -171,9 +171,9 @@ void V_DrawFadeConsBack(INT32 plines);
 void V_DrawPromptBack(INT32 boxheight, INT32 color);
 
 // draw a single character
-void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed);
+void V_DrawCharacter(INT32 x, INT32 y, INT32 c, INT32 flags, boolean lowercaseallowed);
 // draw a single character, but for the chat
-void V_DrawChatCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed, UINT8 *colormap);
+void V_DrawChatCharacter(INT32 x, INT32 y, INT32 c, INT32 flags, boolean lowercaseallowed, UINT8 *colormap);
 
 UINT8 *V_GetStringColormap(INT32 colorflags);
 
@@ -182,6 +182,7 @@ void V_DrawLevelTitle(INT32 x, INT32 y, INT32 option, const char *string);
 // wordwrap a string using the hu_font
 char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string);
 UINT8 *V_GetStringColormap(INT32 colorflags);
+UINT8 V_CharUppercase(UINT8 chr);
 
 // draw a string using the hu_font
 void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string);