From 154d9c5f18a505de9b82212eebd13d3a8b632112 Mon Sep 17 00:00:00 2001 From: toaster Date: Sun, 29 Jan 2023 01:10:54 +0000 Subject: [PATCH] Replay Hut: Remove all snapto flags so it works with the border for other aspect ratios --- src/k_menudraw.c | 74 ++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/k_menudraw.c b/src/k_menudraw.c index d56804ee7..c11112f21 100644 --- a/src/k_menudraw.c +++ b/src/k_menudraw.c @@ -3892,18 +3892,18 @@ static void M_DrawReplayHutReplayInfo(menudemo_t *demoref) switch (demoref->type) { case MD_NOTLOADED: - V_DrawCenteredString(160, 40, V_SNAPTOTOP, "Loading replay information..."); + V_DrawCenteredString(160, 40, 0, "Loading replay information..."); break; case MD_INVALID: - V_DrawCenteredString(160, 40, V_SNAPTOTOP|warningflags, "This replay cannot be played."); + V_DrawCenteredString(160, 40, warningflags, "This replay cannot be played."); break; case MD_SUBDIR: break; // Can't think of anything to draw here right now case MD_OUTDATED: - V_DrawThinString(17, 64, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT|highlightflags, "Recorded on an outdated version."); + V_DrawThinString(17, 64, V_ALLOWLOWERCASE|V_TRANSLUCENT|highlightflags, "Recorded on an outdated version."); /* FALLTHRU */ default: // Draw level stuff @@ -3912,7 +3912,7 @@ static void M_DrawReplayHutReplayInfo(menudemo_t *demoref) K_DrawMapThumbnail( x<kartspeed & DF_ENCORE) ? V_FLIP : 0), + ((demoref->kartspeed & DF_ENCORE) ? V_FLIP : 0), demoref->map, NULL); @@ -3920,7 +3920,7 @@ static void M_DrawReplayHutReplayInfo(menudemo_t *demoref) { static angle_t rubyfloattime = 0; const fixed_t rubyheight = FINESINE(rubyfloattime>>ANGLETOFINESHIFT); - V_DrawFixedPatch((x+40)<map < nummapheaders && mapheaderinfo[demoref->map]) { char *title = G_BuildMapTitle(demoref->map+1); - V_DrawString(x, y, V_SNAPTOTOP, title); + V_DrawString(x, y, 0, title); Z_Free(title); } else - V_DrawString(x, y, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT, "Level is not loaded."); + V_DrawString(x, y, V_ALLOWLOWERCASE|V_TRANSLUCENT, "Level is not loaded."); if (demoref->numlaps) - V_DrawThinString(x, y+9, V_SNAPTOTOP|V_ALLOWLOWERCASE, va("(%d laps)", demoref->numlaps)); + V_DrawThinString(x, y+9, V_ALLOWLOWERCASE, va("(%d laps)", demoref->numlaps)); { const char *gtstring; @@ -3952,42 +3952,42 @@ static void M_DrawReplayHutReplayInfo(menudemo_t *demoref) gtstring = va("%s (%s)", gtstring, kartspeed_cons_t[(demoref->kartspeed & ~DF_ENCORE) + 1].strvalue); } - V_DrawString(x, y+20, V_SNAPTOTOP|V_ALLOWLOWERCASE, gtstring); + V_DrawString(x, y+20, V_ALLOWLOWERCASE, gtstring); } if (!demoref->standings[0].ranking) { // No standings were loaded! - V_DrawString(x, y+39, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT, "No standings available."); + V_DrawString(x, y+39, V_ALLOWLOWERCASE|V_TRANSLUCENT, "No standings available."); break; } - V_DrawThinString(x, y+29, V_SNAPTOTOP|highlightflags, "WINNER"); - V_DrawString(x+38, y+30, V_SNAPTOTOP|V_ALLOWLOWERCASE, demoref->standings[0].name); + V_DrawThinString(x, y+29, highlightflags, "WINNER"); + V_DrawString(x+38, y+30, V_ALLOWLOWERCASE, demoref->standings[0].name); if (demoref->gametype >= 0) { if (gametypes[demoref->gametype]->rules & GTR_POINTLIMIT) { - V_DrawThinString(x, y+39, V_SNAPTOTOP|highlightflags, "SCORE"); + V_DrawThinString(x, y+39, highlightflags, "SCORE"); } else { - V_DrawThinString(x, y+39, V_SNAPTOTOP|highlightflags, "TIME"); + V_DrawThinString(x, y+39, highlightflags, "TIME"); } if (demoref->standings[0].timeorscore == (UINT32_MAX-1)) { - V_DrawThinString(x+32, y+39, V_SNAPTOTOP, "NO CONTEST"); + V_DrawThinString(x+32, y+39, 0, "NO CONTEST"); } else if (gametypes[demoref->gametype]->rules & GTR_POINTLIMIT) { - V_DrawString(x+32, y+40, V_SNAPTOTOP, va("%d", demoref->standings[0].timeorscore)); + V_DrawString(x+32, y+40, 0, va("%d", demoref->standings[0].timeorscore)); } else { - V_DrawRightAlignedString(x+84, y+40, V_SNAPTOTOP, va("%d'%02d\"%02d", + V_DrawRightAlignedString(x+84, y+40, 0, va("%d'%02d\"%02d", G_TicsToMinutes(demoref->standings[0].timeorscore, true), G_TicsToSeconds(demoref->standings[0].timeorscore), G_TicsToCentiseconds(demoref->standings[0].timeorscore) @@ -4017,7 +4017,7 @@ static void M_DrawReplayHutReplayInfo(menudemo_t *demoref) GTC_MENUCACHE); } - V_DrawMappedPatch(BASEVIDWIDTH-15 - SHORT(patch->width), y+20, V_SNAPTOTOP, patch, colormap); + V_DrawMappedPatch(BASEVIDWIDTH-15 - SHORT(patch->width), y+20, 0, patch, colormap); break; } @@ -4082,9 +4082,9 @@ void M_DrawReplayHut(void) cursory = localy; if ((currentMenu->menuitems[i].status & IT_DISPLAY)==IT_STRING) - V_DrawString(x, localy, V_SNAPTOTOP|V_SNAPTOLEFT, currentMenu->menuitems[i].text); + V_DrawString(x, localy, 0, currentMenu->menuitems[i].text); else - V_DrawString(x, localy, V_SNAPTOTOP|V_SNAPTOLEFT|highlightflags, currentMenu->menuitems[i].text); + V_DrawString(x, localy, highlightflags, currentMenu->menuitems[i].text); } y += currentMenu->menuitems[replaylistitem].mvar1; @@ -4108,7 +4108,7 @@ void M_DrawReplayHut(void) if (extrasmenu.demolist[i].type == MD_SUBDIR) { localx += 8; - V_DrawScaledPatch(x - 4, localy, V_SNAPTOTOP|V_SNAPTOLEFT, W_CachePatchName(dirmenu[i][DIR_TYPE] == EXT_UP ? "M_RBACK" : "M_RFLDR", PU_CACHE)); + V_DrawScaledPatch(x - 4, localy, 0, W_CachePatchName(dirmenu[i][DIR_TYPE] == EXT_UP ? "M_RBACK" : "M_RFLDR", PU_CACHE)); } if (itemOn == replaylistitem && i == (INT16)dir_on[menudepthleft]) @@ -4138,27 +4138,27 @@ void M_DrawReplayHut(void) } } - V_DrawString(localx - (extrasmenu.replayScrollTitle>>1), localy, V_SNAPTOTOP|V_SNAPTOLEFT|highlightflags|V_ALLOWLOWERCASE, extrasmenu.demolist[i].title); + V_DrawString(localx - (extrasmenu.replayScrollTitle>>1), localy, highlightflags|V_ALLOWLOWERCASE, extrasmenu.demolist[i].title); } else - V_DrawString(localx, localy, V_SNAPTOTOP|V_SNAPTOLEFT|V_ALLOWLOWERCASE, extrasmenu.demolist[i].title); + V_DrawString(localx, localy, V_ALLOWLOWERCASE, extrasmenu.demolist[i].title); } // Draw scrollbar y = sizedirmenu*10 + currentMenu->menuitems[replaylistitem].mvar1 + 30; if (y > SCALEDVIEWHEIGHT-80) { - V_DrawFill(BASEVIDWIDTH-4, 75, 4, SCALEDVIEWHEIGHT-80, V_SNAPTOTOP|V_SNAPTORIGHT|159); - V_DrawFill(BASEVIDWIDTH-3, 76 + (SCALEDVIEWHEIGHT-80) * replayhutmenuy / y, 2, (((SCALEDVIEWHEIGHT-80) * (SCALEDVIEWHEIGHT-80))-1) / y - 1, V_SNAPTOTOP|V_SNAPTORIGHT|149); + V_DrawFill(BASEVIDWIDTH-4, 75, 4, SCALEDVIEWHEIGHT-80, 159); + V_DrawFill(BASEVIDWIDTH-3, 76 + (SCALEDVIEWHEIGHT-80) * replayhutmenuy / y, 2, (((SCALEDVIEWHEIGHT-80) * (SCALEDVIEWHEIGHT-80))-1) / y - 1, 149); } // Draw the cursor - V_DrawScaledPatch(currentMenu->x - 24, cursory, V_SNAPTOTOP|V_SNAPTOLEFT, + V_DrawScaledPatch(currentMenu->x - 24, cursory, 0, W_CachePatchName("M_CURSOR", PU_CACHE)); - V_DrawString(currentMenu->x, cursory, V_SNAPTOTOP|V_SNAPTOLEFT|highlightflags, currentMenu->menuitems[itemOn].text); + V_DrawString(currentMenu->x, cursory, highlightflags, currentMenu->menuitems[itemOn].text); // Now draw some replay info! - V_DrawFill(10, 10, 300, 60, V_SNAPTOTOP|159); + V_DrawFill(10, 10, 300, 60, 159); if (itemOn == replaylistitem) { @@ -4182,17 +4182,17 @@ void M_DrawReplayStartMenu(void) patch_t *patch; UINT8 *colormap; - V_DrawRightAlignedString(BASEVIDWIDTH-100, STARTY + i*20, V_SNAPTOTOP|highlightflags, va("%2d", demoref->standings[i].ranking)); - V_DrawThinString(BASEVIDWIDTH-96, STARTY + i*20, V_SNAPTOTOP|V_ALLOWLOWERCASE, demoref->standings[i].name); + V_DrawRightAlignedString(BASEVIDWIDTH-100, STARTY + i*20,highlightflags, va("%2d", demoref->standings[i].ranking)); + V_DrawThinString(BASEVIDWIDTH-96, STARTY + i*20, V_ALLOWLOWERCASE, demoref->standings[i].name); if (demoref->standings[i].timeorscore == UINT32_MAX-1) - V_DrawThinString(BASEVIDWIDTH-92, STARTY + i*20 + 9, V_SNAPTOTOP, "NO CONTEST"); + V_DrawThinString(BASEVIDWIDTH-92, STARTY + i*20 + 9, 0, "NO CONTEST"); else if (demoref->gametype < 0) ; else if (gametypes[demoref->gametype]->rules & GTR_POINTLIMIT) - V_DrawString(BASEVIDWIDTH-92, STARTY + i*20 + 9, V_SNAPTOTOP, va("%d", demoref->standings[i].timeorscore)); + V_DrawString(BASEVIDWIDTH-92, STARTY + i*20 + 9, 0, va("%d", demoref->standings[i].timeorscore)); else - V_DrawRightAlignedString(BASEVIDWIDTH-40, STARTY + i*20 + 9, V_SNAPTOTOP, va("%d'%02d\"%02d", + V_DrawRightAlignedString(BASEVIDWIDTH-40, STARTY + i*20 + 9, 0, va("%d'%02d\"%02d", G_TicsToMinutes(demoref->standings[i].timeorscore, true), G_TicsToSeconds(demoref->standings[i].timeorscore), G_TicsToCentiseconds(demoref->standings[i].timeorscore) @@ -4220,7 +4220,7 @@ void M_DrawReplayStartMenu(void) GTC_MENUCACHE); } - V_DrawMappedPatch(BASEVIDWIDTH-5 - SHORT(patch->width), STARTY + i*20, V_SNAPTOTOP, patch, colormap); + V_DrawMappedPatch(BASEVIDWIDTH-5 - SHORT(patch->width), STARTY + i*20, 0, patch, colormap); } #undef STARTY @@ -4248,10 +4248,10 @@ void M_DrawReplayStartMenu(void) } } - V_DrawFill(10, 10, 300, 60, V_SNAPTOTOP|159); + V_DrawFill(10, 10, 300, 60, 159); M_DrawReplayHutReplayInfo(demoref); - V_DrawString(10, 72, V_SNAPTOTOP|highlightflags|V_ALLOWLOWERCASE, demoref->title); + V_DrawString(10, 72, highlightflags|V_ALLOWLOWERCASE, demoref->title); // Draw a warning prompt if needed switch (demoref->addonstatus) @@ -4277,7 +4277,7 @@ void M_DrawReplayStartMenu(void) return; } - V_DrawSmallString(4, BASEVIDHEIGHT-14, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, warning); + V_DrawSmallString(4, BASEVIDHEIGHT-14, V_ALLOWLOWERCASE, warning); } // Draw misc menus: