From a536f884cedf722d47e35ea4afe4e63028964ddc Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 9 Jul 2023 20:13:14 +0100 Subject: [PATCH] V_ALLOWLOWERCASE --> V_FORCEUPPERCASE Content of commit was originally written by Sal, but as a monolithic commit. The author of this commit is chunking it up for easier review. Simple inversion on the face of things, but with a long tail of consequences, including 19 changed files. Forced uppercase has been applied in a handful of locations where it was aesthetically imperative. Most menus will follow in another commit, so that that may be reverted if we change the default menu font. --- src/console.c | 7 +- src/deh_tables.c | 2 +- src/f_finale.c | 38 +++---- src/hu_stuff.c | 24 ++--- src/k_hud.c | 42 ++++---- src/k_menudraw.c | 159 +++++++++++++++--------------- src/k_podium.c | 18 ++-- src/k_zvote.c | 4 +- src/lua_hudlib.c | 8 +- src/m_perfstats.c | 32 +++--- src/media/avrecorder_feedback.cpp | 2 +- src/p_spec.c | 1 - src/s_sound.c | 4 +- src/screen.c | 2 +- src/st_stuff.c | 24 ++--- src/v_draw.cpp | 2 +- src/v_video.cpp | 24 ++--- src/v_video.h | 4 +- src/y_inter.c | 16 +-- 19 files changed, 207 insertions(+), 206 deletions(-) diff --git a/src/console.c b/src/console.c index 42b2e85b4..3c5e0f9f2 100644 --- a/src/console.c +++ b/src/console.c @@ -1949,10 +1949,11 @@ void CON_DrawLoadBar(void) barwidth = (BASEVIDWIDTH * con_startup_loadprogress) / LOADED_ALLDONE; V_DrawFill(0, BASEVIDHEIGHT - barheight, barwidth, barheight, 0); -#ifdef DEVELOP + if (con_startup_loadprogress <= LOADED_ALLDONE) - V_DrawString(4, BASEVIDHEIGHT - (barheight + 8 + 4), 0, CON_LoadingStrings[con_startup_loadprogress]); -#endif + { + V_DrawString(4, BASEVIDHEIGHT - (barheight + 8 + 4), V_FORCEUPPERCASE, CON_LoadingStrings[con_startup_loadprogress]); + } Unlock_state(); } diff --git a/src/deh_tables.c b/src/deh_tables.c index 59af77da5..81d93615d 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -6863,7 +6863,7 @@ struct int_const_s const INT_CONST[] = { {"V_REVERSESUBTRACT",V_REVERSESUBTRACT}, {"V_MODULATE",V_MODULATE}, {"V_OVERLAY",V_OVERLAY}, - {"V_ALLOWLOWERCASE",V_ALLOWLOWERCASE}, + {"V_FORCEUPPERCASE",V_FORCEUPPERCASE}, {"V_FLIP",V_FLIP}, {"V_VFLIP",V_VFLIP}, {"V_SNAPTOTOP",V_SNAPTOTOP}, diff --git a/src/f_finale.c b/src/f_finale.c index 98d0c15eb..cd14941ef 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -755,12 +755,12 @@ void F_CreditDrawer(void) break; case 2: if (y>>FRACBITS > -10) - V_DrawStringAtFixed((BASEVIDWIDTH-V_StringWidth(&credits[i][1], V_ALLOWLOWERCASE|V_YELLOWMAP))<>1, y, V_ALLOWLOWERCASE|V_YELLOWMAP, &credits[i][1]); + V_DrawStringAtFixed((BASEVIDWIDTH-V_StringWidth(&credits[i][1], V_YELLOWMAP))<>1, y, V_YELLOWMAP, &credits[i][1]); y += 12<>FRACBITS > -10) - V_DrawStringAtFixed(32<scene[scenenum].fadeoutid, true, NULL, false, false); } - V_DrawString(textxpos, textypos, V_ALLOWLOWERCASE, cutscene_disptext); + V_DrawString(textxpos, textypos, 0, cutscene_disptext); } void F_CutsceneTicker(void) @@ -2628,12 +2628,12 @@ void F_TextPromptDrawer(void) } // Draw text - V_DrawString(textx, texty, (V_SNAPTOBOTTOM|V_ALLOWLOWERCASE), cutscene_disptext); + V_DrawString(textx, texty, V_SNAPTOBOTTOM, cutscene_disptext); // Draw name // Don't use V_YELLOWMAP here so that the name color can be changed with control codes if (textprompts[cutnum]->page[scenenum].name[0]) - V_DrawString(textx, namey, (V_SNAPTOBOTTOM|V_ALLOWLOWERCASE), textprompts[cutnum]->page[scenenum].name); + V_DrawString(textx, namey, V_SNAPTOBOTTOM, textprompts[cutnum]->page[scenenum].name); // Draw chevron if (promptblockcontrols && !timetonext) diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 48725247e..9ff155e8b 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -868,7 +868,7 @@ void HU_TickSongCredits(void) if (cursongcredit.anim > 0) { - INT32 len = V_ThinStringWidth(cursongcredit.text, V_ALLOWLOWERCASE|V_6WIDTHSPACE); + INT32 len = V_ThinStringWidth(cursongcredit.text, V_6WIDTHSPACE); fixed_t destx = (len+7) * FRACUNIT; if (cursongcredit.trans > 0) @@ -1293,7 +1293,7 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string) continue; } - if (!(option & V_ALLOWLOWERCASE)) + if (!!(option & V_FORCEUPPERCASE)) c = toupper(c); c -= HU_FONTSTART; @@ -1349,7 +1349,7 @@ static void HU_drawMiniChat(void) for (; i>0; i--) { - char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i-1]); + char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT, chat_mini[i-1]); size_t j = 0; INT32 linescount = 0; @@ -1422,7 +1422,7 @@ static void HU_drawMiniChat(void) INT32 timer = ((cv_chattime.value*TICRATE)-chat_timers[i]) - cv_chattime.value*TICRATE+9; // see below... INT32 transflag = (timer >= 0 && timer <= 9) ? (timer*V_10TRANS) : 0; // you can make bad jokes out of this one. size_t j = 0; - char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i]); // get the current message, and word wrap it. + char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT, chat_mini[i]); // get the current message, and word wrap it. UINT8 *colormap = NULL; while(msg[j]) // iterate through msg @@ -1528,7 +1528,7 @@ static void HU_drawChatLog(INT32 offset) { INT32 clrflag = 0; INT32 j = 0; - char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_log[i]); // get the current message, and word wrap it. + char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT, chat_log[i]); // get the current message, and word wrap it. UINT8 *colormap = NULL; while(msg[j]) // iterate through msg { @@ -1776,14 +1776,14 @@ static void HU_DrawChat(void) char name[MAXPLAYERNAME+1]; strlcpy(name, player_names[i], 7); // shorten name to 7 characters. V_DrawFillConsoleMap(chatx+ boxw + 2, p_dispy- (6*count), 48, 6, 159 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud. - V_DrawSmallString(chatx+ boxw + 4, p_dispy- (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, name)); + V_DrawSmallString(chatx+ boxw + 4, p_dispy- (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT, va("\x82%d\x80 - %s", i, name)); count++; } } if (count == 0) // no results. { V_DrawFillConsoleMap(chatx+boxw+2, p_dispy- (6*count), 48, 6, 159 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud. - V_DrawSmallString(chatx+boxw+4, p_dispy- (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT."); + V_DrawSmallString(chatx+boxw+4, p_dispy- (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT, "NO RESULT."); } } @@ -1983,11 +1983,11 @@ static void HU_DrawDemoInfo(void) if (!multiplayer)/* netreplay */ { V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-40, 0, M_GetText("Replay:")); - V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-32, V_ALLOWLOWERCASE, player_names[0]); + V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-32, 0, player_names[0]); } else { - V_DrawRightAlignedThinString(BASEVIDWIDTH-2, BASEVIDHEIGHT-10, V_ALLOWLOWERCASE, demo.titlename); + V_DrawRightAlignedThinString(BASEVIDWIDTH-2, BASEVIDHEIGHT-10, 0, demo.titlename); } if (modeattacking & ATTACKING_TIME) @@ -2048,7 +2048,7 @@ void HU_DrawSongCredits(void) } V_DrawRightAlignedThinStringAtFixed(x, y, - V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_SNAPTOLEFT|(cursongcredit.trans<= dupadjust+8) diff --git a/src/k_hud.c b/src/k_hud.c index 660974a05..55e32f3aa 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -1487,9 +1487,9 @@ static void K_drawKartItem(void) if (offset) { if (flipamount) // reminder that this is for 3/4p's right end of the screen. - V_DrawString(fx+2, fy+31, V_ALLOWLOWERCASE|V_HUDTRANS|V_SLIDEIN|fflags, va("x%d", stplyr->itemamount)); + V_DrawString(fx+2, fy+31, V_HUDTRANS|V_SLIDEIN|fflags, va("x%d", stplyr->itemamount)); else - V_DrawString(fx+24, fy+31, V_ALLOWLOWERCASE|V_HUDTRANS|V_SLIDEIN|fflags, va("x%d", stplyr->itemamount)); + V_DrawString(fx+24, fy+31, V_HUDTRANS|V_SLIDEIN|fflags, va("x%d", stplyr->itemamount)); } else { @@ -3288,7 +3288,7 @@ static void K_DrawTypingNotifier(fixed_t x, fixed_t y, player_t *p) static void K_DrawNameTagForPlayer(fixed_t x, fixed_t y, player_t *p) { const INT32 clr = skincolors[p->skincolor].chatcolor; - const INT32 namelen = V_ThinStringWidth(player_names[p - players], V_6WIDTHSPACE|V_ALLOWLOWERCASE); + const INT32 namelen = V_ThinStringWidth(player_names[p - players], V_6WIDTHSPACE); UINT8 *colormap = V_GetStringColormap(clr); INT32 barx = 0, bary = 0, barw = 0; @@ -3336,7 +3336,7 @@ static void K_DrawNameTagForPlayer(fixed_t x, fixed_t y, player_t *p) V_DrawFixedPatch(x, y, FRACUNIT, 0, kp_nametagstem, colormap); // Draw the name itself - V_DrawThinStringAtFixed(x + (5*FRACUNIT), y - (26*FRACUNIT), V_6WIDTHSPACE|V_ALLOWLOWERCASE|clr, player_names[p - players]); + V_DrawThinStringAtFixed(x + (5*FRACUNIT), y - (26*FRACUNIT), V_6WIDTHSPACE|clr, player_names[p - players]); } typedef struct weakspotdraw_t @@ -5116,7 +5116,7 @@ static void K_DrawDirectorButton(INT32 idx, const char *label, patch_t *kp[2], I } } - textflags |= (flags | V_6WIDTHSPACE | V_ALLOWLOWERCASE); + textflags |= (flags | V_6WIDTHSPACE); K_drawButtonAnim(x, y - 4, flags, kp, leveltime); V_DrawRightAlignedThinString(x - 2, y, textflags, label); @@ -5209,7 +5209,7 @@ static void K_drawDistributionDebugger(void) x + (18 * scale), y + (23 * scale), scale, FRACUNIT, FRACUNIT, - V_ALLOWLOWERCASE|V_SNAPTOTOP, + V_SNAPTOTOP, NULL, HU_FONT, va("x%d", amount) ); @@ -5218,15 +5218,15 @@ static void K_drawDistributionDebugger(void) y += space; } - V_DrawString((x >> FRACBITS) + 20, 2, V_ALLOWLOWERCASE|V_SNAPTOTOP, va("useOdds[%u]", rouletteData.useOdds)); - V_DrawString((x >> FRACBITS) + 20, 10, V_ALLOWLOWERCASE|V_SNAPTOTOP, va("speed = %u", rouletteData.speed)); + V_DrawString((x >> FRACBITS) + 20, 2, V_SNAPTOTOP, va("useOdds[%u]", rouletteData.useOdds)); + V_DrawString((x >> FRACBITS) + 20, 10, V_SNAPTOTOP, va("speed = %u", rouletteData.speed)); - V_DrawString((x >> FRACBITS) + 20, 22, V_ALLOWLOWERCASE|V_SNAPTOTOP, va("baseDist = %u", rouletteData.baseDist)); - V_DrawString((x >> FRACBITS) + 20, 30, V_ALLOWLOWERCASE|V_SNAPTOTOP, va("dist = %u", rouletteData.dist)); + V_DrawString((x >> FRACBITS) + 20, 22, V_SNAPTOTOP, va("baseDist = %u", rouletteData.baseDist)); + V_DrawString((x >> FRACBITS) + 20, 30, V_SNAPTOTOP, va("dist = %u", rouletteData.dist)); - V_DrawString((x >> FRACBITS) + 20, 42, V_ALLOWLOWERCASE|V_SNAPTOTOP, va("firstDist = %u", rouletteData.firstDist)); - V_DrawString((x >> FRACBITS) + 20, 50, V_ALLOWLOWERCASE|V_SNAPTOTOP, va("secondDist = %u", rouletteData.secondDist)); - V_DrawString((x >> FRACBITS) + 20, 58, V_ALLOWLOWERCASE|V_SNAPTOTOP, va("secondToFirst = %u", rouletteData.secondToFirst)); + V_DrawString((x >> FRACBITS) + 20, 42, V_SNAPTOTOP, va("firstDist = %u", rouletteData.firstDist)); + V_DrawString((x >> FRACBITS) + 20, 50, V_SNAPTOTOP, va("secondDist = %u", rouletteData.secondDist)); + V_DrawString((x >> FRACBITS) + 20, 58, V_SNAPTOTOP, va("secondToFirst = %u", rouletteData.secondToFirst)); #ifndef ITEM_LIST_SIZE Z_Free(rouletteData.itemList); @@ -5350,19 +5350,19 @@ static void K_DrawGPRankDebugger(void) grade = K_CalculateGPGrade(&grandprixinfo.rank); - V_DrawThinString(0, 0, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE|V_ALLOWLOWERCASE, + V_DrawThinString(0, 0, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE, va("POS: %d / %d", grandprixinfo.rank.position, RANK_NEUTRAL_POSITION)); - V_DrawThinString(0, 10, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE|V_ALLOWLOWERCASE, + V_DrawThinString(0, 10, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE, va("PTS: %d / %d", grandprixinfo.rank.winPoints, grandprixinfo.rank.totalPoints)); - V_DrawThinString(0, 20, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE|V_ALLOWLOWERCASE, + V_DrawThinString(0, 20, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE, va("LAPS: %d / %d", grandprixinfo.rank.laps, grandprixinfo.rank.totalLaps)); - V_DrawThinString(0, 30, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE|V_ALLOWLOWERCASE, + V_DrawThinString(0, 30, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE, va("CONTINUES: %d", grandprixinfo.rank.continuesUsed)); - V_DrawThinString(0, 40, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE|V_ALLOWLOWERCASE, + V_DrawThinString(0, 40, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE, va("PRISONS: %d / %d", grandprixinfo.rank.prisons, grandprixinfo.rank.totalPrisons)); - V_DrawThinString(0, 50, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE|V_ALLOWLOWERCASE, + V_DrawThinString(0, 50, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE, va("RINGS: %d / %d", grandprixinfo.rank.rings, grandprixinfo.rank.totalRings)); - V_DrawThinString(0, 60, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE|V_ALLOWLOWERCASE, + V_DrawThinString(0, 60, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE, va("EMERALD: %s", (grandprixinfo.rank.specialWon == true) ? "YES" : "NO")); switch (grade) @@ -5376,7 +5376,7 @@ static void K_DrawGPRankDebugger(void) default: { break; } } - V_DrawThinString(0, 90, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE|V_ALLOWLOWERCASE|V_YELLOWMAP, + V_DrawThinString(0, 90, V_SNAPTOTOP|V_SNAPTOLEFT|V_6WIDTHSPACE|V_YELLOWMAP, va(" ** FINAL GRADE: %c", gradeChar)); } diff --git a/src/k_menudraw.c b/src/k_menudraw.c index 152629e7f..31026461a 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -369,7 +369,7 @@ static void M_DrawMenuTooltips(void) if (currentMenu->menuitems[itemOn].tooltip != NULL) { V_DrawFixedPatch(0, 0, FRACUNIT, 0, W_CachePatchName("MENUHINT", PU_CACHE), NULL); - V_DrawCenteredThinString(BASEVIDWIDTH/2, 12, V_ALLOWLOWERCASE|V_6WIDTHSPACE, currentMenu->menuitems[itemOn].tooltip); + V_DrawCenteredThinString(BASEVIDWIDTH/2, 12, V_6WIDTHSPACE, currentMenu->menuitems[itemOn].tooltip); } } @@ -400,7 +400,7 @@ static void M_DrawMenuTyping(void) if (currentMenu->menuitems[itemOn].text) { - V_DrawThinString(x + 5, y - 2, highlightflags|V_6WIDTHSPACE|V_ALLOWLOWERCASE, currentMenu->menuitems[itemOn].text); + V_DrawThinString(x + 5, y - 2, highlightflags|V_6WIDTHSPACE, currentMenu->menuitems[itemOn].text); } M_DrawMenuTooltips(); @@ -414,7 +414,7 @@ static void M_DrawMenuTyping(void) V_DrawFill(x + 4, y + 4 + 5, 1, 8+6, 121); V_DrawFill(x + 5 + boxwidth - 8, y + 4 + 5, 1, 8+6, 121); - V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string); + V_DrawString(x + 8, y + 12, 0, cv->string); if (skullAnimCounter < 4 && menutyping.menutypingclose == false && menutyping.menutypingfade == (menutyping.keyboardtyping ? 9 : 18)) @@ -449,7 +449,7 @@ static void M_DrawMenuTyping(void) j = 0; while (j < NUMVIRTUALKEYSINROW) { - INT32 mflag = V_ALLOWLOWERCASE|V_6WIDTHSPACE; + INT32 mflag = V_6WIDTHSPACE; INT16 c = virtualKeyboard[i][j]; INT32 buttonspacing = 1; @@ -595,11 +595,11 @@ static void M_DrawMenuTyping(void) // Some contextual stuff if (menutyping.keyboardtyping) { - V_DrawThinString(returnx, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_GRAYMAP, "Type using your keyboard. Press Enter to confirm & exit.\nUse your controller or any directional input to use the Virtual Keyboard.\n"); + V_DrawThinString(returnx, y, V_6WIDTHSPACE|V_GRAYMAP, "Type using your keyboard. Press Enter to confirm & exit.\nUse your controller or any directional input to use the Virtual Keyboard.\n"); } else { - V_DrawThinString(returnx, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_GRAYMAP, "Type using the Virtual Keyboard. Use the \'OK\' button to confirm & exit.\nPress any keyboard key not bound to a control to use it."); + V_DrawThinString(returnx, y, V_6WIDTHSPACE|V_GRAYMAP, "Type using the Virtual Keyboard. Use the \'OK\' button to confirm & exit.\nPress any keyboard key not bound to a control to use it."); } } @@ -622,7 +622,7 @@ void M_DrawMenuMessage(void) if (menumessage.header != NULL) { - V_DrawThinString(x, y - 10, highlightflags|V_6WIDTHSPACE|V_ALLOWLOWERCASE, menumessage.header); + V_DrawThinString(x, y - 10, highlightflags|V_6WIDTHSPACE, menumessage.header); } if (menumessage.defaultstr) @@ -640,10 +640,10 @@ void M_DrawMenuMessage(void) push = ((menumessage.timer % (anim_duration * 2)) < anim_duration); } - workx -= V_ThinStringWidth(menumessage.defaultstr, V_6WIDTHSPACE|V_ALLOWLOWERCASE); + workx -= V_ThinStringWidth(menumessage.defaultstr, V_6WIDTHSPACE); V_DrawThinString( workx, worky + 1, - V_6WIDTHSPACE|V_ALLOWLOWERCASE + V_6WIDTHSPACE | ((push && (menumessage.closing & MENUMESSAGECLOSE)) ? highlightflags : 0), menumessage.defaultstr ); @@ -671,10 +671,10 @@ void M_DrawMenuMessage(void) if (menumessage.closing) push = !push; - workx -= V_ThinStringWidth(menumessage.confirmstr, V_6WIDTHSPACE|V_ALLOWLOWERCASE); + workx -= V_ThinStringWidth(menumessage.confirmstr, V_6WIDTHSPACE); V_DrawThinString( workx, worky + 1, - V_6WIDTHSPACE|V_ALLOWLOWERCASE + V_6WIDTHSPACE | ((push && (menumessage.closing & MENUMESSAGECLOSE)) ? highlightflags : 0), menumessage.confirmstr ); @@ -733,7 +733,7 @@ void M_DrawMenuMessage(void) } } - V_DrawString((BASEVIDWIDTH - V_StringWidth(string, 0))/2, y, V_ALLOWLOWERCASE, string); + V_DrawString((BASEVIDWIDTH - V_StringWidth(string, 0))/2, y, 0, string); y += 8; } } @@ -782,7 +782,7 @@ void M_Drawer(void) if (customversionstring[0] != '\0') { V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT, "Mod version:"); - V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, customversionstring); + V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT, customversionstring); } else { @@ -930,7 +930,7 @@ void M_DrawGenericMenu(void) V_DrawString(x + (skullAnimCounter/5) + 6, y + 12, highlightflags, "\x1D"); } - V_DrawString(x + xoffs + 8, y + 12, V_ALLOWLOWERCASE, cv->string); + V_DrawString(x + xoffs + 8, y + 12, 0, cv->string); y += 16; } @@ -1086,7 +1086,7 @@ void M_DrawKartGamemodeMenu(void) (type == IT_TRANSTEXT2 ? V_TRANSLUCENT : 0 - )|V_ALLOWLOWERCASE, + ), colormap, currentMenu->menuitems[i].text); } @@ -1170,7 +1170,7 @@ void M_DrawMessageMenu(void) } } - V_DrawString((BASEVIDWIDTH - V_StringWidth(string, 0))/2,y,V_ALLOWLOWERCASE,string); + V_DrawString((BASEVIDWIDTH - V_StringWidth(string, 0))/2,y,0,string); y += 8; //SHORT(hu_font[0]->height); } } @@ -1726,7 +1726,7 @@ static void M_DrawCharSelectPreview(UINT8 num) else if (p->mdepth == CSSTEP_ASKCHANGES) { UINT8 i; - char choices[2][9] = {"All good", "Change"}; + char choices[2][9] = {"ALL GOOD", "CHANGE"}; INT32 xpos = x+8; INT32 ypos = y+38; @@ -2293,7 +2293,7 @@ void M_DrawRaceDifficulty(void) consvar_t *cv = currentMenu->menuitems[i].itemaction.cvar; V_DrawFixedPatch(x*FRACUNIT, y*FRACUNIT, FRACUNIT, 0, W_CachePatchName("MENUSHRT", PU_CACHE), colormap); - V_DrawCenteredGamemodeString(centx, y - 3, V_ALLOWLOWERCASE, colormap, cv->string); + V_DrawCenteredGamemodeString(centx, y - 3, 0, colormap, cv->string); if (i == itemOn) { @@ -2308,7 +2308,7 @@ void M_DrawRaceDifficulty(void) else // not a cvar { V_DrawFixedPatch(x*FRACUNIT, y*FRACUNIT, FRACUNIT, 0, W_CachePatchName("MENUPLTR", PU_CACHE), colormap); - V_DrawGamemodeString(x + 16, y - 3, V_ALLOWLOWERCASE, colormap, currentMenu->menuitems[i].text); + V_DrawGamemodeString(x + 16, y - 3, 0, colormap, currentMenu->menuitems[i].text); } x += GM_XOFFSET; y += GM_YOFFSET; @@ -2917,7 +2917,6 @@ void M_DrawTimeAttack(void) if (mapheaderinfo[levellist.choosemap]->ghostCount <= 1) drawarrows = false; - optflags |= V_ALLOWLOWERCASE; if (mapheaderinfo[levellist.choosemap] == NULL) str = "Invalid map"; else if (cv_dummystaff.value > mapheaderinfo[levellist.choosemap]->ghostCount) @@ -3009,7 +3008,7 @@ static void M_MPOptDrawer(menu_t *m, INT16 extend[3][3]) } } V_DrawFixedPatch((x + (extend[i][2]/2)) *FRACUNIT, (y + extend[i][2])*FRACUNIT, FRACUNIT, 0, buttback, colormap); - V_DrawCenteredGamemodeString(x, y - 3, V_ALLOWLOWERCASE, colormap, m->menuitems[i].text); + V_DrawCenteredGamemodeString(x, y - 3, 0, colormap, m->menuitems[i].text); } break; } @@ -3061,7 +3060,7 @@ void M_DrawMPHost(void) // Ideally we'd calculate this but it's not worth it for a 1-off menu probably..... V_DrawFixedPatch(xp<width/2), yp -3, V_ALLOWLOWERCASE, colormap, currentMenu->menuitems[i].text); + V_DrawCenteredGamemodeString(xp + (gobutt->width/2), yp -3, 0, colormap, currentMenu->menuitems[i].text); } else { @@ -3069,14 +3068,14 @@ void M_DrawMPHost(void) { case IT_TRANSTEXT2: { - V_DrawThinString(xp, yp, V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_TRANSLUCENT, currentMenu->menuitems[i].text); + V_DrawThinString(xp, yp, V_6WIDTHSPACE|V_TRANSLUCENT, currentMenu->menuitems[i].text); xp += 5; yp += 11; break; } case IT_STRING: { - V_DrawThinString(xp, yp, V_ALLOWLOWERCASE|V_6WIDTHSPACE | (i == itemOn ? highlightflags : 0), currentMenu->menuitems[i].text); + V_DrawThinString(xp, yp, V_6WIDTHSPACE | (i == itemOn ? highlightflags : 0), currentMenu->menuitems[i].text); // Cvar specific handling switch (currentMenu->menuitems[i].status & IT_TYPE) @@ -3095,7 +3094,7 @@ void M_DrawMPHost(void) V_DrawString(xp + (skullAnimCounter/5) + 94, yp+1, highlightflags, "\x1D"); } - V_DrawThinString(xp + xoffs + 96, yp, V_ALLOWLOWERCASE|V_6WIDTHSPACE, cv->string); + V_DrawThinString(xp + xoffs + 96, yp, V_6WIDTHSPACE, cv->string); } break; @@ -3188,7 +3187,7 @@ void M_DrawMPJoinIP(void) strcpy(str, "---"); // If that fails too then there's nothing! } - V_DrawThinString(xp, yp, V_ALLOWLOWERCASE | ((i == itemOn || currentMenu->menuitems[i].status & IT_SPACE) ? highlightflags : 0)|V_ALLOWLOWERCASE|V_6WIDTHSPACE, str); + V_DrawThinString(xp, yp, ((i == itemOn || currentMenu->menuitems[i].status & IT_SPACE) ? highlightflags : 0)|V_6WIDTHSPACE, str); // Cvar specific handling switch (currentMenu->menuitems[i].status & IT_TYPE) @@ -3213,7 +3212,7 @@ void M_DrawMPJoinIP(void) V_DrawString(xp + (skullAnimCounter/5) + 17, yp+1, highlightflags, "\x1D"); } - V_DrawThinString(xp + xoffs + 18, yp, V_ALLOWLOWERCASE|V_6WIDTHSPACE, cv->string); + V_DrawThinString(xp + xoffs + 18, yp, V_6WIDTHSPACE, cv->string); } /*// On this specific menu the only time we'll ever see this is for the connect by IP typefield. @@ -3361,7 +3360,7 @@ void M_DrawMPServerBrowser(void) V_DrawFixedPatch(startx*FRACUNIT, (starty + ypos)*FRACUNIT, FRACUNIT, transflag, racegt ? raceh : batlh, NULL); // Server name: - V_DrawString(startx+11, starty + ypos + 6, V_ALLOWLOWERCASE|transflag, serverlist[i].info.servername); + V_DrawString(startx+11, starty + ypos + 6, transflag, serverlist[i].info.servername); // Ping: V_DrawThinString(startx + 191, starty + ypos + 7, V_6WIDTHSPACE|transflag, va("%03d", serverlist[i].info.time)); @@ -3389,7 +3388,7 @@ void M_DrawMPServerBrowser(void) V_DrawFill(0, 53, 320, 1, 31); V_DrawFill(0, 55, 320, 1, 31); - V_DrawCenteredGamemodeString(160, 2, V_ALLOWLOWERCASE, 0, "Server Browser"); + V_DrawCenteredGamemodeString(160, 2, 0, 0, "Server Browser"); // normal menu options M_DrawGenericMenu(); @@ -3434,7 +3433,7 @@ void M_DrawOptionsMovingButton(void) UINT8 *c = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_PLAGUE, GTC_CACHE); V_DrawFixedPatch((optionsmenu.optx)*FRACUNIT, (optionsmenu.opty)*FRACUNIT, FRACUNIT, 0, butt, c); - V_DrawCenteredGamemodeString((optionsmenu.optx)-3, (optionsmenu.opty) - 16, V_ALLOWLOWERCASE, c, OPTIONS_MainDef.menuitems[OPTIONS_MainDef.lastOn].text); + V_DrawCenteredGamemodeString((optionsmenu.optx)-3, (optionsmenu.opty) - 16, 0, c, OPTIONS_MainDef.menuitems[OPTIONS_MainDef.lastOn].text); } void M_DrawOptions(void) @@ -3465,7 +3464,7 @@ void M_DrawOptions(void) if (!(menutransition.tics && i == itemOn)) { V_DrawFixedPatch(px*FRACUNIT, py*FRACUNIT, FRACUNIT, 0, buttback, c); - V_DrawCenteredGamemodeString(px-3, py - 16, V_ALLOWLOWERCASE|tflag, (i == itemOn ? c : NULL), currentMenu->menuitems[i].text); + V_DrawCenteredGamemodeString(px-3, py - 16, tflag, (i == itemOn ? c : NULL), currentMenu->menuitems[i].text); } y += 48; @@ -3552,7 +3551,7 @@ void M_DrawGenericOptions(void) V_DrawString(x + (skullAnimCounter/5) + 6, y + 12, highlightflags, "\x1D"); } - V_DrawString(x + xoffs + 8, y + 12, V_ALLOWLOWERCASE, cv->string); + V_DrawString(x + xoffs + 8, y + 12, 0, cv->string); y += 16; } @@ -3649,7 +3648,7 @@ void M_DrawProfileErase(void) } V_DrawString(x, y, - (i == optionsmenu.eraseprofilen ? highlightflags : 0)|V_ALLOWLOWERCASE, + (i == optionsmenu.eraseprofilen ? highlightflags : 0), va("%sPRF%03d - %s (%s)", (cv_currprofile.value == i) ? "[In use] " : "", i, pr->profilename, pr->playername)); @@ -3705,7 +3704,7 @@ void M_DrawEditProfile(void) V_DrawFixedPatch(0, 0, FRACUNIT, 0, W_CachePatchName("MENUHINT", PU_CACHE), NULL); if (currentMenu->menuitems[itemOn].tooltip != NULL) { - V_DrawCenteredThinString(224, 12, V_ALLOWLOWERCASE|V_6WIDTHSPACE, currentMenu->menuitems[itemOn].tooltip); + V_DrawCenteredThinString(224, 12, V_6WIDTHSPACE, currentMenu->menuitems[itemOn].tooltip); } // Draw the menu options... @@ -3721,7 +3720,7 @@ void M_DrawEditProfile(void) // Background V_DrawFill(0, y, 400 - (menutransition.tics*64), 24, itemOn == i ? 169 : 30); // 169 is the plague colourization // Text - V_DrawGamemodeString(x + (menutransition.tics*32), y - 6, V_ALLOWLOWERCASE|tflag, colormap, currentMenu->menuitems[i].text); + V_DrawGamemodeString(x + (menutransition.tics*32), y - 6, tflag, colormap, currentMenu->menuitems[i].text); // Cvar specific handling /*switch (currentMenu->menuitems[i].status & IT_TYPE) @@ -3733,7 +3732,7 @@ void M_DrawEditProfile(void) { case IT_CV_STRING: V_DrawFill(0, y+24, 400 - (menutransition.tics*64), 16, itemOn == i ? 169 : 30); // 169 is the plague colourization - V_DrawString(x + 8, y + 29, V_ALLOWLOWERCASE, cv->string); + V_DrawString(x + 8, y + 29, 0, cv->string); if (skullAnimCounter < 4 && i == itemOn) V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 29, '_' | 0x80, false); y += 16; @@ -3833,7 +3832,7 @@ void M_DrawProfileControls(void) V_DrawFixedPatch(0, 0, FRACUNIT, 0, W_CachePatchName("MENUHINT", PU_CACHE), NULL); if (currentMenu->menuitems[itemOn].tooltip != NULL) { - V_DrawCenteredThinString(229, 12, V_ALLOWLOWERCASE|V_6WIDTHSPACE, currentMenu->menuitems[itemOn].tooltip); + V_DrawCenteredThinString(229, 12, V_6WIDTHSPACE, currentMenu->menuitems[itemOn].tooltip); } V_DrawFill(0, 0, 138, 200, 31); // Black border @@ -3891,7 +3890,7 @@ void M_DrawProfileControls(void) } else if (currentMenu->menuitems[i].status & IT_CONTROL) { - UINT32 vflags = V_6WIDTHSPACE; + UINT32 vflags = V_6WIDTHSPACE|V_FORCEUPPERCASE; INT32 gc = currentMenu->menuitems[i].mvar1; UINT8 available = 0, set = 0; @@ -4180,7 +4179,7 @@ void M_DrawItemToggles(void) { V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISMUL", PU_CACHE)); V_DrawScaledPatch(x, y, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[thisitem].mvar1, true), PU_CACHE)); - V_DrawString(x+24, y+31, V_ALLOWLOWERCASE|translucent, va("x%d", drawnum)); + V_DrawString(x+24, y+31, translucent, va("x%d", drawnum)); } else V_DrawScaledPatch(x, y, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[thisitem].mvar1, true), PU_CACHE)); @@ -4245,7 +4244,7 @@ void M_DrawExtrasMovingButton(void) UINT8 *c = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_PLAGUE, GTC_CACHE); V_DrawFixedPatch((extrasmenu.extx)*FRACUNIT, (extrasmenu.exty)*FRACUNIT, FRACUNIT, 0, butt, c); - V_DrawCenteredGamemodeString((extrasmenu.extx)-3, (extrasmenu.exty) - 16, V_ALLOWLOWERCASE, c, EXTRAS_MainDef.menuitems[EXTRAS_MainDef.lastOn].text); + V_DrawCenteredGamemodeString((extrasmenu.extx)-3, (extrasmenu.exty) - 16, 0, c, EXTRAS_MainDef.menuitems[EXTRAS_MainDef.lastOn].text); } void M_DrawExtras(void) @@ -4277,7 +4276,7 @@ void M_DrawExtras(void) if (!(menutransition.tics && i == itemOn)) { V_DrawFixedPatch(px*FRACUNIT, py*FRACUNIT, FRACUNIT, 0, buttback, c); - V_DrawCenteredGamemodeString(px-3, py - 16, V_ALLOWLOWERCASE|tflag, (i == itemOn ? c : NULL), currentMenu->menuitems[i].text); + V_DrawCenteredGamemodeString(px-3, py - 16, tflag, (i == itemOn ? c : NULL), currentMenu->menuitems[i].text); } y += 48; @@ -4644,13 +4643,13 @@ void M_DrawKickHandler(void) P_IsMachineLocalPlayer(&players[i]) ? highlightflags : 0 - )|V_ALLOWLOWERCASE|V_6WIDTHSPACE, + )|V_6WIDTHSPACE, player_names[i] ); V_DrawRightAlignedThinString( x+118, y-2, - V_ALLOWLOWERCASE|V_6WIDTHSPACE, + V_6WIDTHSPACE, (players[i].spectator) ? "SPECTATOR" : "PLAYING" ); } @@ -4681,7 +4680,7 @@ void M_DrawKickHandler(void) V_DrawFixedPatch(0, 0, FRACUNIT, 0, W_CachePatchName("MENUHINT", PU_CACHE), NULL); V_DrawCenteredThinString( BASEVIDWIDTH/2, 12, - V_ALLOWLOWERCASE|V_6WIDTHSPACE, + V_6WIDTHSPACE, (playerkickmenu.adminpowered) ? "You are using ""\x85""Admin Tools""\x80"", ""\x83""(A)""\x80"" to kick and ""\x84""(C)""\x80"" to ban" : K_GetMidVoteLabel(menucallvote) @@ -4734,7 +4733,7 @@ void M_DrawPlaybackMenu(void) V_DrawCharacter(currentMenu->x + currentMenu->menuitems[i].mvar1 + 4, currentMenu->y + 14, '\x1A' | V_SNAPTOTOP|highlightflags, false); - V_DrawCenteredString(BASEVIDWIDTH/2, currentMenu->y + 18, V_SNAPTOTOP|V_ALLOWLOWERCASE, currentMenu->menuitems[i].text); + V_DrawCenteredString(BASEVIDWIDTH/2, currentMenu->y + 18, V_SNAPTOTOP, currentMenu->menuitems[i].text); if ((currentMenu->menuitems[i].status & IT_TYPE) == IT_ARROWS) { @@ -4765,7 +4764,7 @@ void M_DrawPlaybackMenu(void) continue; } - V_DrawCenteredString(BASEVIDWIDTH/2, currentMenu->y + 38, V_SNAPTOTOP|V_ALLOWLOWERCASE|highlightflags, str); + V_DrawCenteredString(BASEVIDWIDTH/2, currentMenu->y + 38, V_SNAPTOTOP|highlightflags, str); } } } @@ -4833,7 +4832,7 @@ void M_DrawAddons(void) y -= 16; - V_DrawString(x-21, y + (lsheadingheight - 12), highlightflags|V_ALLOWLOWERCASE, M_AddonsHeaderPath()); + V_DrawString(x-21, y + (lsheadingheight - 12), highlightflags, M_AddonsHeaderPath()); V_DrawFill(x-21, y + (lsheadingheight - 3), MAXSTRINGLENGTH*8+6, 1, hilicol); //V_DrawFill(x-21, y + (lsheadingheight - 2), MAXSTRINGLENGTH*8+6, 1, 30); @@ -4849,7 +4848,7 @@ void M_DrawAddons(void) xoffs += 8; V_DrawString(x + (skullAnimCounter/5) - 20, y+8, highlightflags, "\x1D"); } - V_DrawString(x + xoffs - 18, y+8, V_ALLOWLOWERCASE|tflag, str); + V_DrawString(x + xoffs - 18, y+8, tflag, str); } V_DrawSmallScaledPatch(x - (21 + 5 + 16), y+4, (menusearch[0] ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+3]); @@ -4900,7 +4899,7 @@ void M_DrawAddons(void) for (; i < m; i++) { - UINT32 flags = V_ALLOWLOWERCASE; + UINT32 flags = 0; if (y > BASEVIDHEIGHT) break; if (dirmenu[i]) #define type (UINT8)(dirmenu[i][DIR_TYPE]) @@ -4917,7 +4916,7 @@ void M_DrawAddons(void) if (itemOn == 1 && (size_t)i == dir_on[menudepthleft]) { V_DrawFixedPatch((x-(16+4))<width); - V_DrawThinString(x, y + 1, V_6WIDTHSPACE|V_ALLOWLOWERCASE|highlightflags, "Toggle"); + V_DrawThinString(x, y + 1, V_6WIDTHSPACE|highlightflags, "Toggle"); break; @@ -5924,7 +5923,7 @@ challengedesc: ) ) { - V_DrawCenteredString(BASEVIDWIDTH/2, 120 + 32, V_ALLOWLOWERCASE, challengesmenu.unlockcondition); + V_DrawCenteredString(BASEVIDWIDTH/2, 120 + 32, 0, challengesmenu.unlockcondition); } } @@ -6047,7 +6046,7 @@ static void M_DrawStatsMaps(void) { char *title = G_BuildMapTitle(mnum+1); - V_DrawThinString(24, y, V_6WIDTHSPACE, title); + V_DrawThinString(24, y, V_6WIDTHSPACE|V_FORCEUPPERCASE, title); Z_Free(title); } @@ -6143,7 +6142,7 @@ void M_DrawStatistics(void) } beststr[0] = 0; - V_DrawThinString(20, 22, V_6WIDTHSPACE|V_ALLOWLOWERCASE|highlightflags, "Total Play Time:"); + V_DrawThinString(20, 22, V_6WIDTHSPACE|highlightflags, "Total Play Time:"); besttime = G_TicsToHours(gamedata->totalplaytime); if (besttime) { @@ -6165,7 +6164,7 @@ void M_DrawStatistics(void) V_DrawRightAlignedThinString(BASEVIDWIDTH-20, 22, V_6WIDTHSPACE, beststr); beststr[0] = 0; - V_DrawThinString(20, 32, V_6WIDTHSPACE|V_ALLOWLOWERCASE|highlightflags, "Total Rings:"); + V_DrawThinString(20, 32, V_6WIDTHSPACE|highlightflags, "Total Rings:"); if (gamedata->totalrings > GDMAX_RINGS) { sprintf(beststr, "%c999,999,999+", '\x82'); @@ -6185,7 +6184,7 @@ void M_DrawStatistics(void) V_DrawRightAlignedThinString(BASEVIDWIDTH-20, 32, V_6WIDTHSPACE, va("%s collected", beststr)); beststr[0] = 0; - V_DrawThinString(20, 42, V_6WIDTHSPACE|V_ALLOWLOWERCASE|highlightflags, "Total Rounds:"); + V_DrawThinString(20, 42, V_6WIDTHSPACE|highlightflags, "Total Rounds:"); strcat(beststr, va("%u Race", gamedata->roundsplayed[GDGT_RACE])); @@ -6210,7 +6209,7 @@ void M_DrawStatistics(void) if (!statisticsmenu.maplist) { - V_DrawCenteredThinString(BASEVIDWIDTH/2, 62, V_6WIDTHSPACE|V_ALLOWLOWERCASE, "No maps!?"); + V_DrawCenteredThinString(BASEVIDWIDTH/2, 62, V_6WIDTHSPACE, "No maps!?"); return; } @@ -6230,15 +6229,15 @@ void M_DrawStatistics(void) besttime += mapheaderinfo[i]->records.time; } - V_DrawThinString(20, 60, V_6WIDTHSPACE|V_ALLOWLOWERCASE, "Combined time records:"); + V_DrawThinString(20, 60, V_6WIDTHSPACE, "Combined time records:"); sprintf(beststr, "%i:%02i:%02i.%02i", G_TicsToHours(besttime), G_TicsToMinutes(besttime, false), G_TicsToSeconds(besttime), G_TicsToCentiseconds(besttime)); - V_DrawRightAlignedThinString(BASEVIDWIDTH-20, 60, V_6WIDTHSPACE|V_ALLOWLOWERCASE|(mapsunfinished ? V_REDMAP : 0), beststr); + V_DrawRightAlignedThinString(BASEVIDWIDTH-20, 60, V_6WIDTHSPACE|(mapsunfinished ? V_REDMAP : 0), beststr); if (mapsunfinished) - V_DrawRightAlignedThinString(BASEVIDWIDTH-20, 70, V_6WIDTHSPACE|V_ALLOWLOWERCASE|V_REDMAP, va("(%d unfinished)", mapsunfinished)); + V_DrawRightAlignedThinString(BASEVIDWIDTH-20, 70, V_6WIDTHSPACE|V_REDMAP, va("(%d unfinished)", mapsunfinished)); else - V_DrawRightAlignedThinString(BASEVIDWIDTH-20, 70, V_6WIDTHSPACE|V_ALLOWLOWERCASE, "(complete)"); + V_DrawRightAlignedThinString(BASEVIDWIDTH-20, 70, V_6WIDTHSPACE, "(complete)"); V_DrawThinString(32, 70, V_6WIDTHSPACE, va("x %d/%d", M_CountMedals(false, false), M_CountMedals(true, false))); V_DrawSmallMappedPatch(20, 70, 0, W_CachePatchName("GOTITA", PU_CACHE), @@ -6443,15 +6442,15 @@ void M_DrawSoundTest(void) if (!titletext) titletext = "Untitled"; // Har har. - V_DrawThinString(x+1, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE, titletext); + V_DrawThinString(x+1, y, V_6WIDTHSPACE, titletext); if (soundtest.current->numtracks > 1) - V_DrawThinString(x+1, (y += 10), V_ALLOWLOWERCASE|V_6WIDTHSPACE, va("Track %c", 'A'+soundtest.currenttrack)); + V_DrawThinString(x+1, (y += 10), V_6WIDTHSPACE, va("Track %c", 'A'+soundtest.currenttrack)); if (soundtest.current->author) - V_DrawThinString(x+1, (y += 10), V_ALLOWLOWERCASE|V_6WIDTHSPACE, soundtest.current->author); + V_DrawThinString(x+1, (y += 10), V_6WIDTHSPACE, soundtest.current->author); if (soundtest.current->source) - V_DrawThinString(x+1, (y += 10), V_ALLOWLOWERCASE|V_6WIDTHSPACE, soundtest.current->source); + V_DrawThinString(x+1, (y += 10), V_6WIDTHSPACE, soundtest.current->source); if (soundtest.current->composers) - V_DrawThinString(x+1, (y += 10), V_ALLOWLOWERCASE|V_6WIDTHSPACE, soundtest.current->composers); + V_DrawThinString(x+1, (y += 10), V_6WIDTHSPACE, soundtest.current->composers); } else { @@ -6459,9 +6458,9 @@ void M_DrawSoundTest(void) titletext = "Sound Test"; - V_DrawThinString(x+1, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE, "Track "); + V_DrawThinString(x+1, y, V_6WIDTHSPACE, "Track "); V_DrawThinString( - x+1 + V_ThinStringWidth("Track ", V_ALLOWLOWERCASE|V_6WIDTHSPACE), + x+1 + V_ThinStringWidth("Track ", V_6WIDTHSPACE), y, V_6WIDTHSPACE, va("%04X - %s", cv_soundtest.value, sfxstr) @@ -6722,17 +6721,17 @@ void M_DrawDiscordRequests(void) V_DrawFixedPatch(56*FRACUNIT, 150*FRACUNIT + handoffset, FRACUNIT, 0, hand, NULL); } - K_DrawSticker(x + (slide * 32), y - 2, V_ThinStringWidth(M_GetDiscordName(curRequest), V_ALLOWLOWERCASE|V_6WIDTHSPACE), 0, false); - V_DrawThinString(x + (slide * 32), y - 1, V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_YELLOWMAP, M_GetDiscordName(curRequest)); + K_DrawSticker(x + (slide * 32), y - 2, V_ThinStringWidth(M_GetDiscordName(curRequest), V_6WIDTHSPACE), 0, false); + V_DrawThinString(x + (slide * 32), y - 1, V_6WIDTHSPACE|V_YELLOWMAP, M_GetDiscordName(curRequest)); - K_DrawSticker(x, y + 12, V_ThinStringWidth(wantText, V_ALLOWLOWERCASE|V_6WIDTHSPACE), 0, true); - V_DrawThinString(x, y + 10, V_ALLOWLOWERCASE|V_6WIDTHSPACE, wantText); + K_DrawSticker(x, y + 12, V_ThinStringWidth(wantText, V_6WIDTHSPACE), 0, true); + V_DrawThinString(x, y + 10, V_6WIDTHSPACE, wantText); INT32 confirmButtonWidth = SHORT(kp_button_a[1][0]->width); INT32 declineButtonWidth = SHORT(kp_button_b[1][0]->width); INT32 altDeclineButtonWidth = SHORT(kp_button_x[1][0]->width); - INT32 acceptTextWidth = V_ThinStringWidth(acceptText, V_ALLOWLOWERCASE|V_6WIDTHSPACE); - INT32 declineTextWidth = V_ThinStringWidth(declineText, V_ALLOWLOWERCASE|V_6WIDTHSPACE); + INT32 acceptTextWidth = V_ThinStringWidth(acceptText, V_6WIDTHSPACE); + INT32 declineTextWidth = V_ThinStringWidth(declineText, V_6WIDTHSPACE); INT32 stickerWidth = (confirmButtonWidth + declineButtonWidth + altDeclineButtonWidth + acceptTextWidth + declineTextWidth); K_DrawSticker(x, y + 26, stickerWidth, 0, true); @@ -6740,7 +6739,7 @@ void M_DrawDiscordRequests(void) INT32 xoffs = confirmButtonWidth; - V_DrawThinString((x + xoffs), y + 24, V_ALLOWLOWERCASE|V_6WIDTHSPACE, acceptText); + V_DrawThinString((x + xoffs), y + 24, V_6WIDTHSPACE, acceptText); xoffs += acceptTextWidth; K_drawButtonAnim((x + xoffs), y + 22, V_SNAPTORIGHT, kp_button_b[1], discordrequestmenu.ticker); @@ -6749,7 +6748,7 @@ void M_DrawDiscordRequests(void) K_drawButtonAnim((x + xoffs), y + 22, V_SNAPTORIGHT, kp_button_x[1], discordrequestmenu.ticker); xoffs += altDeclineButtonWidth; - V_DrawThinString((x + xoffs), y + 24, V_ALLOWLOWERCASE|V_6WIDTHSPACE, declineText); + V_DrawThinString((x + xoffs), y + 24, V_6WIDTHSPACE, declineText); y -= 18; @@ -6759,8 +6758,8 @@ void M_DrawDiscordRequests(void) curRequest = curRequest->next; - K_DrawSticker(x, y - 1 + ySlide, V_ThinStringWidth(M_GetDiscordName(curRequest), V_ALLOWLOWERCASE|V_6WIDTHSPACE), 0, false); - V_DrawThinString(x, y + ySlide, V_ALLOWLOWERCASE|V_6WIDTHSPACE, M_GetDiscordName(curRequest)); + K_DrawSticker(x, y - 1 + ySlide, V_ThinStringWidth(M_GetDiscordName(curRequest), V_6WIDTHSPACE), 0, false); + V_DrawThinString(x, y + ySlide, V_6WIDTHSPACE, M_GetDiscordName(curRequest)); y -= 12; maxYSlide = 12; diff --git a/src/k_podium.c b/src/k_podium.c index c5c70bdb9..2f1694f52 100644 --- a/src/k_podium.c +++ b/src/k_podium.c @@ -542,42 +542,42 @@ void K_CeremonyDrawer(void) { case 1: { - V_DrawString(x, y, V_ALLOWLOWERCASE, + V_DrawString(x, y, 0, va("POS: %d / %d", podiumData.rank.position, RANK_NEUTRAL_POSITION) ); break; } case 2: { - V_DrawString(x, y, V_ALLOWLOWERCASE, + V_DrawString(x, y, 0, va("PTS: %d / %d", podiumData.rank.winPoints, podiumData.rank.totalPoints) ); break; } case 3: { - V_DrawString(x, y, V_ALLOWLOWERCASE, + V_DrawString(x, y, 0, va("LAPS: %d / %d", podiumData.rank.laps, podiumData.rank.totalLaps) ); break; } case 4: { - V_DrawString(x, y, V_ALLOWLOWERCASE, + V_DrawString(x, y, 0, va("CONTINUES: %d", podiumData.rank.continuesUsed) ); break; } case 5: { - V_DrawString(x, y, V_ALLOWLOWERCASE, + V_DrawString(x, y, 0, va("PRISONS: %d / %d", podiumData.rank.prisons, podiumData.rank.totalPrisons) ); break; } case 6: { - V_DrawString(x, y, V_ALLOWLOWERCASE, + V_DrawString(x, y, 0, va("RINGS: %d / %d", podiumData.rank.rings, podiumData.rank.totalRings) ); break; @@ -595,7 +595,7 @@ void K_CeremonyDrawer(void) : "PRIZE"; } - V_DrawString(x, y, V_ALLOWLOWERCASE, + V_DrawString(x, y, 0, va("%s: %s", emeraldstr, (podiumData.rank.specialWon == true) ? "YES" : "NO") @@ -604,14 +604,14 @@ void K_CeremonyDrawer(void) } case 8: { - V_DrawString(x, y + 10, V_YELLOWMAP|V_ALLOWLOWERCASE, + V_DrawString(x, y + 10, V_YELLOWMAP, va(" ** FINAL GRADE: %c", gradeChar) ); break; } case 9: { - V_DrawThinString(2, BASEVIDHEIGHT - 10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_6WIDTHSPACE|V_ALLOWLOWERCASE, + V_DrawThinString(2, BASEVIDHEIGHT - 10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_6WIDTHSPACE, "Press some button type deal to continue" ); break; diff --git a/src/k_zvote.c b/src/k_zvote.c index 784887512..dd27bcd5b 100644 --- a/src/k_zvote.c +++ b/src/k_zvote.c @@ -1172,7 +1172,7 @@ void K_DrawMidVote(void) { strWidth = V__OneScaleStringWidth( FRACUNIT, - V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_SPLITSCREEN|V_6WIDTHSPACE|V_ALLOWLOWERCASE, + V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_SPLITSCREEN|V_6WIDTHSPACE, TINY_FONT, player_names[g_midVote.victim - players] ); @@ -1180,7 +1180,7 @@ void K_DrawMidVote(void) x - (strWidth >> 1), y + (18 * FRACUNIT), FRACUNIT, - V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_SPLITSCREEN|V_6WIDTHSPACE|V_ALLOWLOWERCASE, NULL, + V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_SPLITSCREEN|V_6WIDTHSPACE, NULL, TINY_FONT, player_names[g_midVote.victim - players] ); } diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c index f99f33f6b..5a5583f1a 100644 --- a/src/lua_hudlib.c +++ b/src/lua_hudlib.c @@ -887,7 +887,7 @@ static int libd_drawString(lua_State *L) fixed_t x = luaL_checkinteger(L, 1); fixed_t y = luaL_checkinteger(L, 2); const char *str = luaL_checkstring(L, 3); - INT32 flags = luaL_optinteger(L, 4, V_ALLOWLOWERCASE); + INT32 flags = luaL_optinteger(L, 4, 0); enum align align = luaL_checkoption(L, 5, "left", align_opt); flags &= ~V_PARAMMASK; // Don't let crashes happen. @@ -944,7 +944,7 @@ static int libd_drawTitleCardString(lua_State *L) fixed_t x = luaL_checkinteger(L, 1); fixed_t y = luaL_checkinteger(L, 2); const char *str = luaL_checkstring(L, 3); - INT32 flags = luaL_optinteger(L, 4, V_ALLOWLOWERCASE); + INT32 flags = luaL_optinteger(L, 4, 0); boolean rightalign = lua_optboolean(L, 5); INT32 timer = luaL_optinteger(L, 6, 0); INT32 threshold = luaL_optinteger(L, 7, 0); @@ -969,7 +969,7 @@ static int libd_drawKartString(lua_State *L) fixed_t x = luaL_checkinteger(L, 1); fixed_t y = luaL_checkinteger(L, 2); const char *str = luaL_checkstring(L, 3); - INT32 flags = luaL_optinteger(L, 4, V_ALLOWLOWERCASE); + INT32 flags = luaL_optinteger(L, 4, 0); huddrawlist_h list; flags &= ~V_PARAMMASK; // Don't let crashes happen. @@ -998,7 +998,7 @@ static int libd_titleCardStringWidth(lua_State *L) static int libd_stringWidth(lua_State *L) { const char *str = luaL_checkstring(L, 1); - INT32 flags = luaL_optinteger(L, 2, V_ALLOWLOWERCASE); + INT32 flags = luaL_optinteger(L, 2, 0); enum widtht widtht = luaL_checkoption(L, 3, "normal", widtht_opt); HUDONLY diff --git a/src/m_perfstats.c b/src/m_perfstats.c index 75d43fc50..37697052c 100644 --- a/src/m_perfstats.c +++ b/src/m_perfstats.c @@ -123,7 +123,7 @@ static void M_DrawPerfString(perfstatcol_t *col, int type) int value; if (hires) - draw_flags |= V_ALLOWLOWERCASE; + draw_flags |= 0; for (row = col->rows; row->lores_label; ++row) { @@ -476,7 +476,7 @@ static void M_DrawTickStats(void) if (M_HighResolution()) { - V_DrawSmallString(212, 10, V_MONOSPACE | V_ALLOWLOWERCASE | V_PURPLEMAP, "Calls:"); + V_DrawSmallString(212, 10, V_MONOSPACE | V_PURPLEMAP, "Calls:"); draw_row = 15; } @@ -507,7 +507,7 @@ void M_DrawPerfStats(void) if (vid.width < 640 || vid.height < 400) // low resolution { // it's not gonna fit very well.. - V_DrawThinString(30, 30, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, "Not available for resolutions below 640x400"); + V_DrawThinString(30, 30, V_MONOSPACE | V_YELLOWMAP, "Not available for resolutions below 640x400"); } else // high resolution { @@ -526,10 +526,10 @@ void M_DrawPerfStats(void) } snprintf(s, sizeof s - 1, "Bot %d (%s):", i + 1, player_names[i]); - V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_GRAYMAP, s); + V_DrawSmallString(x, y, V_MONOSPACE | V_GRAYMAP, s); snprintf(s, sizeof s - 1, "%ld", (long)((ps_bots[i].total) / (I_GetPrecisePrecision() / 1000000))); - V_DrawRightAlignedSmallString(x + 98, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_GRAYMAP, s); + V_DrawRightAlignedSmallString(x + 98, y, V_MONOSPACE | V_GRAYMAP, s); y += 4; // repeated code! if (y > 192) @@ -541,10 +541,10 @@ void M_DrawPerfStats(void) } snprintf(s, sizeof s - 1, "Prediction:"); - V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, s); + V_DrawSmallString(x, y, V_MONOSPACE | V_YELLOWMAP, s); snprintf(s, sizeof s - 1, "%ld", (long)((ps_bots[i].prediction) / (I_GetPrecisePrecision() / 1000000))); - V_DrawRightAlignedSmallString(x + 98, y, V_MONOSPACE | V_ALLOWLOWERCASE, s); + V_DrawRightAlignedSmallString(x + 98, y, V_MONOSPACE, s); y += 4; // repeated code! if (y > 192) @@ -556,10 +556,10 @@ void M_DrawPerfStats(void) } snprintf(s, sizeof s - 1, "Nudge:"); - V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, s); + V_DrawSmallString(x, y, V_MONOSPACE | V_YELLOWMAP, s); snprintf(s, sizeof s - 1, "%ld", (long)((ps_bots[i].nudge) / (I_GetPrecisePrecision() / 1000000))); - V_DrawRightAlignedSmallString(x + 98, y, V_MONOSPACE | V_ALLOWLOWERCASE, s); + V_DrawRightAlignedSmallString(x + 98, y, V_MONOSPACE, s); y += 4; // repeated code! if (y > 192) @@ -571,10 +571,10 @@ void M_DrawPerfStats(void) } snprintf(s, sizeof s - 1, "Item:"); - V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, s); + V_DrawSmallString(x, y, V_MONOSPACE | V_YELLOWMAP, s); snprintf(s, sizeof s - 1, "%ld", (long)((ps_bots[i].item) / (I_GetPrecisePrecision() / 1000000))); - V_DrawRightAlignedSmallString(x + 98, y, V_MONOSPACE | V_ALLOWLOWERCASE, s); + V_DrawRightAlignedSmallString(x + 98, y, V_MONOSPACE, s); y += 4; // repeated code! if (y > 192) @@ -586,11 +586,11 @@ void M_DrawPerfStats(void) } snprintf(s, sizeof s - 1, "Other:"); - V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, s); + V_DrawSmallString(x, y, V_MONOSPACE | V_YELLOWMAP, s); otherTime = ps_bots[i].total - ps_bots[i].prediction - ps_bots[i].nudge - ps_bots[i].item; snprintf(s, sizeof s - 1, "%ld", (long)(otherTime / (I_GetPrecisePrecision() / 1000000))); - V_DrawRightAlignedSmallString(x + 98, y, V_MONOSPACE | V_ALLOWLOWERCASE, s); + V_DrawRightAlignedSmallString(x + 98, y, V_MONOSPACE, s); y += 4; // repeated code! if (y > 192) @@ -621,7 +621,7 @@ void M_DrawPerfStats(void) if (vid.width < 640 || vid.height < 400) // low resolution { // it's not gonna fit very well.. - V_DrawThinString(30, 30, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, "Not available for resolutions below 640x400"); + V_DrawThinString(30, 30, V_MONOSPACE | V_YELLOWMAP, "Not available for resolutions below 640x400"); } else // high resolution { @@ -664,7 +664,7 @@ void M_DrawPerfStats(void) if (len > 25) tempstr += len - 25; snprintf(s, sizeof s - 1, "%s", tempstr); - V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_GRAYMAP, s); + V_DrawSmallString(x, y, V_MONOSPACE | V_GRAYMAP, s); y += 4; // repeated code! if (y > 192) { @@ -689,7 +689,7 @@ void M_DrawPerfStats(void) if (len > 20) str += len - 20; snprintf(s, sizeof s - 1, "%20s: %ld", str, (long)((thinkframe_hooks[i].time_taken) / (I_GetPrecisePrecision() / 1000000))); - V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | text_color, s); + V_DrawSmallString(x, y, V_MONOSPACE | text_color, s); y += 4; // repeated code! if (y > 192) { diff --git a/src/media/avrecorder_feedback.cpp b/src/media/avrecorder_feedback.cpp index 4dac2eaf6..e0d360933 100644 --- a/src/media/avrecorder_feedback.cpp +++ b/src/media/avrecorder_feedback.cpp @@ -104,7 +104,7 @@ void AVRecorder::draw_statistics() const V_DrawThinString( x, 190, - (V_6WIDTHSPACE | V_ALLOWLOWERCASE | V_SNAPTOBOTTOM | V_SNAPTORIGHT) | flags, + (V_6WIDTHSPACE | V_SNAPTOBOTTOM | V_SNAPTORIGHT) | flags, text.c_str() ); }; diff --git a/src/p_spec.c b/src/p_spec.c index d43c6e07b..575cc9a89 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -34,7 +34,6 @@ #include "p_polyobj.h" #include "p_slopes.h" #include "hu_stuff.h" -#include "v_video.h" // V_ALLOWLOWERCASE #include "m_misc.h" #include "m_cond.h" //unlock triggers #include "lua_hook.h" // LUA_HookSpecialExecute diff --git a/src/s_sound.c b/src/s_sound.c index 5e45232e7..baf3d07e0 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -2165,7 +2165,7 @@ void S_ShowMusicCredit(void) } } - widthused -= V_ThinStringWidth(credittext, V_ALLOWLOWERCASE|V_6WIDTHSPACE); + widthused -= V_ThinStringWidth(credittext, V_6WIDTHSPACE); #define MUSICCREDITAPPEND(field)\ if (field)\ @@ -2174,7 +2174,7 @@ void S_ShowMusicCredit(void) worklen = strlen(work);\ if (worklen <= len)\ {\ - workwidth = V_ThinStringWidth(work, V_ALLOWLOWERCASE|V_6WIDTHSPACE);\ + workwidth = V_ThinStringWidth(work, V_6WIDTHSPACE);\ if (widthused >= workwidth)\ {\ strncat(credittext, work, len);\ diff --git a/src/screen.c b/src/screen.c index b584cb9f8..8f2113265 100644 --- a/src/screen.c +++ b/src/screen.c @@ -696,7 +696,7 @@ void SCR_ClosedCaptions(void) if (music && !gamestopped && (closedcaptions[i].t < flashingtics) && (closedcaptions[i].t & 1)) continue; - flags = V_SNAPTORIGHT|V_SNAPTOBOTTOM|V_ALLOWLOWERCASE; + flags = V_SNAPTORIGHT|V_SNAPTOBOTTOM; y = basey-((i + 2)*10); if (closedcaptions[i].b) diff --git a/src/st_stuff.c b/src/st_stuff.c index f04dd34fc..45c63c84f 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -1172,7 +1172,7 @@ static void ST_overlayDrawer(void) if (!r_splitscreen) { V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-40, V_HUDTRANSHALF, M_GetText("VIEWPOINT:")); - V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-32, V_HUDTRANSHALF|V_ALLOWLOWERCASE, player_names[stplyr-players]); + V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-32, V_HUDTRANSHALF, player_names[stplyr-players]); } else if (r_splitscreen == 1) { @@ -1180,11 +1180,11 @@ static void ST_overlayDrawer(void) INT32 y = (stplyr == &players[displayplayers[0]]) ? 4 : BASEVIDHEIGHT/2-12; sprintf(name, "VIEWPOINT: %s", player_names[stplyr-players]); - V_DrawRightAlignedThinString(BASEVIDWIDTH-40, y, V_HUDTRANSHALF|V_ALLOWLOWERCASE|V_SNAPTOTOP|V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_SPLITSCREEN, name); + V_DrawRightAlignedThinString(BASEVIDWIDTH-40, y, V_HUDTRANSHALF|V_SNAPTOTOP|V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_SPLITSCREEN, name); } else if (r_splitscreen) { - V_DrawCenteredThinString((vid.width/vid.dupx)/4, BASEVIDHEIGHT/2 - 12, V_HUDTRANSHALF|V_ALLOWLOWERCASE|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_SPLITSCREEN, player_names[stplyr-players]); + V_DrawCenteredThinString((vid.width/vid.dupx)/4, BASEVIDHEIGHT/2 - 12, V_HUDTRANSHALF|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_SPLITSCREEN, player_names[stplyr-players]); } } } @@ -1257,17 +1257,17 @@ void ST_DrawDemoTitleEntry(void) #define x (BASEVIDWIDTH/2 - 139) #define y (BASEVIDHEIGHT/2) M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1); - V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, nametodraw); + V_DrawString(x + 8, y + 12, 0, nametodraw); if (anim < 4) V_DrawCharacter(x + 8 + V_StringWidth(nametodraw, 0), y + 12, '_' | 0x80, false); M_DrawTextBox(x + 30, y - 24, 26, 1); - V_DrawString(x + 38, y - 16, V_ALLOWLOWERCASE, "Enter the name of the replay."); + V_DrawString(x + 38, y - 16, 0, "Enter the name of the replay."); M_DrawTextBox(x + 50, y + 20, 20, 1); - V_DrawThinString(x + 58, y + 28, V_ALLOWLOWERCASE, "Escape - Cancel"); - V_DrawRightAlignedThinString(x + 220, y + 28, V_ALLOWLOWERCASE, "Enter - Confirm"); + V_DrawThinString(x + 58, y + 28, 0, "Escape - Cancel"); + V_DrawRightAlignedThinString(x + 220, y + 28, 0, "Enter - Confirm"); #undef x #undef y } @@ -1384,20 +1384,20 @@ void ST_Drawer(void) INT32 buttony = 2; K_drawButtonAnim(buttonx - 76, buttony, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT, kp_button_b[1], leveltime); - V_DrawRightAlignedThinString(buttonx - 55, buttony, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_YELLOWMAP, "or"); + V_DrawRightAlignedThinString(buttonx - 55, buttony, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_6WIDTHSPACE|V_YELLOWMAP, "or"); K_drawButtonAnim(buttonx - 55, buttony, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT, kp_button_x[1], leveltime); - V_DrawRightAlignedThinString(buttonx - 2, buttony, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_YELLOWMAP, "Save replay"); + V_DrawRightAlignedThinString(buttonx - 2, buttony, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_6WIDTHSPACE|V_YELLOWMAP, "Save replay"); break; } case DSM_WILLAUTOSAVE: { - V_DrawRightAlignedThinString(BASEVIDWIDTH - 55, 2, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_YELLOWMAP, "Replay will be saved."); + V_DrawRightAlignedThinString(BASEVIDWIDTH - 55, 2, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_6WIDTHSPACE|V_YELLOWMAP, "Replay will be saved."); K_drawButtonAnim(BASEVIDWIDTH - 56, 0, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT, kp_button_b[1], leveltime); - V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_YELLOWMAP, "Change title"); + V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_6WIDTHSPACE|V_YELLOWMAP, "Change title"); break; } case DSM_WILLSAVE: - V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_YELLOWMAP, "Replay will be saved."); + V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_6WIDTHSPACE|V_YELLOWMAP, "Replay will be saved."); break; case DSM_TITLEENTRY: diff --git a/src/v_draw.cpp b/src/v_draw.cpp index c10933707..360998db3 100644 --- a/src/v_draw.cpp +++ b/src/v_draw.cpp @@ -128,7 +128,7 @@ int Draw::font_to_fontno(Font font) INT32 Draw::default_font_flags(Font font) { - INT32 flags = V_ALLOWLOWERCASE; + INT32 flags = 0; if (font == Font::kThin) { diff --git a/src/v_video.cpp b/src/v_video.cpp index f7dd9b878..971afa013 100644 --- a/src/v_video.cpp +++ b/src/v_video.cpp @@ -1795,8 +1795,8 @@ void V_DrawCharacterScaled( font_t *font = &fontv[fontno]; boolean notColored = false; - const boolean uppercase = !(flags & V_ALLOWLOWERCASE); - flags &= ~(V_FLIP); /* These two (V_ALLOWLOWERCASE) share a bit. */ + const boolean uppercase = ((flags & V_FORCEUPPERCASE) == V_FORCEUPPERCASE); + flags &= ~(V_FLIP); /* These two (V_FORCEUPPERCASE) share a bit. */ if (colormap == NULL) { @@ -1851,9 +1851,10 @@ void V_DrawCharacterScaled( void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercase) { - if (lowercase) + // Backwards compatibility + if (lowercase == false) { - c |= V_ALLOWLOWERCASE; + c |= V_FORCEUPPERCASE; } V_DrawCharacterScaled( @@ -1869,9 +1870,10 @@ void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercase) void V_DrawChatCharacter(INT32 x, INT32 y, INT32 c, boolean lowercase, UINT8 *colormap) { - if (lowercase) + // Backwards compatibility + if (lowercase == false) { - c |= V_ALLOWLOWERCASE; + c |= V_FORCEUPPERCASE; } V_DrawCharacterScaled( @@ -2086,7 +2088,7 @@ char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string) continue; } - if (!(option & V_ALLOWLOWERCASE)) + if (!!(option & V_FORCEUPPERCASE)) c = toupper(c); c -= HU_FONTSTART; @@ -2257,8 +2259,8 @@ void V_DrawStringScaled( int c; - uppercase = !( flags & V_ALLOWLOWERCASE ); - flags &= ~(V_FLIP);/* These two (V_ALLOWLOWERCASE) share a bit. */ + uppercase = ((flags & V_FORCEUPPERCASE) == V_FORCEUPPERCASE); + flags &= ~(V_FLIP);/* These two (V_FORCEUPPERCASE) share a bit. */ dance = (flags & V_STRINGDANCE) != 0; nodanceoverride = !dance; @@ -2584,8 +2586,8 @@ fixed_t V_StringScaledWidth( fixed_t fullwidth = 0; - uppercase = !( flags & V_ALLOWLOWERCASE ); - flags &= ~(V_FLIP);/* These two (V_ALLOWLOWERCASE) share a bit. */ + uppercase = ((flags & V_FORCEUPPERCASE) == V_FORCEUPPERCASE); + flags &= ~(V_FLIP);/* These two (V_FORCEUPPERCASE) share a bit. */ font = &fontv[fontno]; diff --git a/src/v_video.h b/src/v_video.h index 1ceb1570e..441f23c0b 100644 --- a/src/v_video.h +++ b/src/v_video.h @@ -175,7 +175,7 @@ void V_CubeApply(RGBA_t *input); #define V_SNAPTOLEFT 0x04000000 // for centering #define V_SNAPTORIGHT 0x08000000 // for centering -#define V_ALLOWLOWERCASE 0x10000000 // (strings only) allow fonts that have lowercase letters to use them +#define V_FORCEUPPERCASE 0x10000000 // (strings only) prevents fonts that have lowercase letters from using them #define V_FLIP 0x10000000 // (patches only) Horizontal flip #define V_SLIDEIN 0x20000000 // Slide in from the sides on level load, depending on snap flags @@ -341,7 +341,7 @@ void V_DrawRightAlignedThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, con // Draws a titlecard font string. // timer: when the letters start appearing (leave to 0 to disable) // threshold: when the letters start disappearing (leave to 0 to disable) (both are INT32 in case you supply negative values...) -// NOTE: This function ignores most conventional string flags (V_RETURN8, V_ALLOWLOWERCASE ...) +// NOTE: This function ignores most conventional string flags (V_RETURN8, V_FORCEUPPERCASE ...) // NOTE: This font only works with uppercase letters. void V_DrawTitleCardString(INT32 x, INT32 y, const char *str, INT32 flags, boolean bossmode, INT32 timer, INT32 threshold); diff --git a/src/y_inter.c b/src/y_inter.c index 54e301db6..e7771a047 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -573,13 +573,13 @@ void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 xoffset) _isHighlightedPlayer(&players[pnum]) ? hilicol : 0 - )|V_ALLOWLOWERCASE|V_6WIDTHSPACE, + )|V_6WIDTHSPACE, player_names[pnum] ); V_DrawRightAlignedThinString( x+118, y-2, - V_ALLOWLOWERCASE|V_6WIDTHSPACE, + V_6WIDTHSPACE, standings->strval[i] ); @@ -622,7 +622,7 @@ void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 xoffset) { V_DrawThinString( x2, y-2, - V_ALLOWLOWERCASE|V_6WIDTHSPACE, + V_6WIDTHSPACE, increasenum ); } @@ -630,7 +630,7 @@ void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 xoffset) { V_DrawRightAlignedThinString( x2, y-2, - V_ALLOWLOWERCASE|V_6WIDTHSPACE, + V_6WIDTHSPACE, increasenum ); } @@ -1397,7 +1397,7 @@ skiptallydrawer: { if (speedscramble != -1 && speedscramble != gamespeed) { - V_DrawCenteredThinString(BASEVIDWIDTH/2, 154, highlightflags|V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, + V_DrawCenteredThinString(BASEVIDWIDTH/2, 154, highlightflags|V_SNAPTOBOTTOM, va(M_GetText("Next race will be %s Speed!"), kartspeed_cons_t[1+speedscramble].strvalue)); } } @@ -1414,13 +1414,13 @@ finalcounter: INT32 buttony = 2; K_drawButtonAnim(buttonx - 76, buttony, 0, kp_button_b[1], replayprompttic); - V_DrawRightAlignedThinString(buttonx - 55, buttony, V_ALLOWLOWERCASE|V_6WIDTHSPACE|highlightflags, "or"); + V_DrawRightAlignedThinString(buttonx - 55, buttony, V_6WIDTHSPACE|highlightflags, "or"); K_drawButtonAnim(buttonx - 55, buttony, 0, kp_button_x[1], replayprompttic); - V_DrawRightAlignedThinString(buttonx - 2, buttony, V_ALLOWLOWERCASE|V_6WIDTHSPACE|highlightflags, "Save replay"); + V_DrawRightAlignedThinString(buttonx - 2, buttony, V_6WIDTHSPACE|highlightflags, "Save replay"); break; } case DSM_SAVED: - V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_ALLOWLOWERCASE|V_6WIDTHSPACE|highlightflags, "Replay saved!"); + V_DrawRightAlignedThinString(BASEVIDWIDTH - 2, 2, V_6WIDTHSPACE|highlightflags, "Replay saved!"); break; case DSM_TITLEENTRY: