thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Menus/Set Resolution: interpolate with menu transition

Browse source
This commit is contained in:
James R 2023-12-27 12:07:09 -08:00
parent 90670d3e24
commit 4733cef0d7
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/k_menudraw.c
View file

@ -4742,14 +4742,15 @@ void M_DrawProfileControls(void)
void M_DrawVideoModes(void) void M_DrawVideoModes(void)
{ {
INT32 i, j, row, col; INT32 i, j, row, col;
INT32 t = M_EaseWithTransition(Easing_Linear, 5 * 64);
M_DrawMenuTooltips(); M_DrawMenuTooltips();
M_DrawOptionsMovingButton(); M_DrawOptionsMovingButton();
V_DrawCenteredString(BASEVIDWIDTH/2 + menutransition.tics*64, currentMenu->y, V_DrawCenteredString(BASEVIDWIDTH/2 + t, currentMenu->y,
highlightflags, "Choose mode, reselect to change default"); highlightflags, "Choose mode, reselect to change default");
row = 41 + menutransition.tics*64; row = 41 + t;
col = currentMenu->y + 14; col = currentMenu->y + 14;
for (i = 0; i < optionsmenu.vidm_nummodes; i++) for (i = 0; i < optionsmenu.vidm_nummodes; i++)
{ {
@ -4771,41 +4772,41 @@ void M_DrawVideoModes(void)
{ {
INT32 testtime = (optionsmenu.vidm_testingmode/TICRATE) + 1; INT32 testtime = (optionsmenu.vidm_testingmode/TICRATE) + 1;
M_CentreText(menutransition.tics*64, currentMenu->y + 75, M_CentreText(t, currentMenu->y + 75,
va("Previewing mode %c%dx%d", va("Previewing mode %c%dx%d",
(SCR_IsAspectCorrect(vid.width, vid.height)) ? 0x83 : 0x80, (SCR_IsAspectCorrect(vid.width, vid.height)) ? 0x83 : 0x80,
vid.width, vid.height)); vid.width, vid.height));
M_CentreText(menutransition.tics*64, currentMenu->y + 75+8, M_CentreText(t, currentMenu->y + 75+8,
"Press ENTER again to keep this mode"); "Press ENTER again to keep this mode");
M_CentreText(menutransition.tics*64, currentMenu->y + 75+16, M_CentreText(t, currentMenu->y + 75+16,
va("Wait %d second%s", testtime, (testtime > 1) ? "s" : "")); va("Wait %d second%s", testtime, (testtime > 1) ? "s" : ""));
M_CentreText(menutransition.tics*64, currentMenu->y + 75+24, M_CentreText(t, currentMenu->y + 75+24,
"or press ESC to return"); "or press ESC to return");
} }
else else
{ {
M_CentreText(menutransition.tics*64, currentMenu->y + 75, M_CentreText(t, currentMenu->y + 75,
va("Current mode is %c%dx%d", va("Current mode is %c%dx%d",
(SCR_IsAspectCorrect(vid.width, vid.height)) ? 0x83 : 0x80, (SCR_IsAspectCorrect(vid.width, vid.height)) ? 0x83 : 0x80,
vid.width, vid.height)); vid.width, vid.height));
M_CentreText(menutransition.tics*64, currentMenu->y + 75+8, M_CentreText(t, currentMenu->y + 75+8,
va("Default mode is %c%dx%d", va("Default mode is %c%dx%d",
(SCR_IsAspectCorrect(cv_scr_width.value, cv_scr_height.value)) ? 0x83 : 0x80, (SCR_IsAspectCorrect(cv_scr_width.value, cv_scr_height.value)) ? 0x83 : 0x80,
cv_scr_width.value, cv_scr_height.value)); cv_scr_width.value, cv_scr_height.value));
V_DrawCenteredString(BASEVIDWIDTH/2 + menutransition.tics*64, currentMenu->y + 75+24, V_DrawCenteredString(BASEVIDWIDTH/2 + t, currentMenu->y + 75+24,
recommendedflags, "Modes marked in GREEN are recommended."); recommendedflags, "Modes marked in GREEN are recommended.");
/* /*
V_DrawCenteredString(BASEVIDWIDTH/2 + menutransition.tics*64, currentMenu->y + 75+16, V_DrawCenteredString(BASEVIDWIDTH/2 + t, currentMenu->y + 75+16,
highlightflags, "High resolutions stress your PC more, but will"); highlightflags, "High resolutions stress your PC more, but will");
V_DrawCenteredString(BASEVIDWIDTH/2 + menutransition.tics*64, currentMenu->y + 75+24, V_DrawCenteredString(BASEVIDWIDTH/2 + t, currentMenu->y + 75+24,
highlightflags, "look sharper. Balance visual quality and FPS!"); highlightflags, "look sharper. Balance visual quality and FPS!");
*/ */
} }
// Draw the cursor for the VidMode menu // Draw the cursor for the VidMode menu
i = 41 - 10 + ((optionsmenu.vidm_selected / optionsmenu.vidm_column_size)*7*13) + menutransition.tics*64; i = 41 - 10 + ((optionsmenu.vidm_selected / optionsmenu.vidm_column_size)*7*13) + t;
j = currentMenu->y + 14 + ((optionsmenu.vidm_selected % optionsmenu.vidm_column_size)*8); j = currentMenu->y + 14 + ((optionsmenu.vidm_selected % optionsmenu.vidm_column_size)*8);
V_DrawScaledPatch(i - 8, j, 0, V_DrawScaledPatch(i - 8, j, 0,