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

Merge branch 'resolution-warning-2' into 'master'

Browse source 
Warn about high resolutions

Closes #615

See merge request KartKrew/Kart!1806
This commit is contained in:
Oni 2024-01-12 02:52:23 +00:00
commit 45122c66ab
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/k_menudraw.c
View file

@ -4999,11 +4999,20 @@ void M_DrawVideoModes(void)
col = currentMenu->y + 14; col = currentMenu->y + 14;
for (i = 0; i < optionsmenu.vidm_nummodes; i++) for (i = 0; i < optionsmenu.vidm_nummodes; i++)
{ {
INT32 colorflag = 0;
boolean isdefault = !strcmp(optionsmenu.modedescs[i].desc, va("%dx%d", cv_scr_width.value, cv_scr_height.value));
if (i == optionsmenu.vidm_selected) if (i == optionsmenu.vidm_selected)
V_DrawMenuString(row, col, highlightflags, optionsmenu.modedescs[i].desc); colorflag = highlightflags;
// Show multiples of 320x200 as green. else if (isdefault)
else colorflag = V_ORANGEMAP;
V_DrawMenuString(row, col, (optionsmenu.modedescs[i].goodratio) ? recommendedflags : 0, optionsmenu.modedescs[i].desc); else if (optionsmenu.modedescs[i].goodratio)
colorflag = recommendedflags; // Show multiples of 320x200 as green.
if (isdefault)
V_DrawScaledPatch(row + 2 + V_MenuStringWidth(optionsmenu.modedescs[i].desc, colorflag), col - 2, 0, W_CachePatchName("RHFAV", PU_CACHE));
V_DrawMenuString(row, col, colorflag, optionsmenu.modedescs[i].desc);
col += 9; col += 9;
if ((i % optionsmenu.vidm_column_size) == (optionsmenu.vidm_column_size-1)) if ((i % optionsmenu.vidm_column_size) == (optionsmenu.vidm_column_size-1))
@ -5036,12 +5045,17 @@ void M_DrawVideoModes(void)
(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(t, currentMenu->y + 75+9, M_CentreText(t, currentMenu->y + 75+9,
va("Default mode is %c%dx%d", va("\x87" "Default mode is %dx%d",
(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_DrawCenteredMenuString(BASEVIDWIDTH/2 + t, currentMenu->y + 75+24,
recommendedflags, "Modes marked in GREEN are recommended.");
if (vid.width > 1280 || vid.height > 800)
V_DrawCenteredMenuString(BASEVIDWIDTH/2 + t, currentMenu->y + 75+24,
(I_GetTime() % 20 >= 10) ? V_REDMAP : V_YELLOWMAP, va("High resolutions will impact performance. Careful!"));
else
V_DrawCenteredMenuString(BASEVIDWIDTH/2 + t, currentMenu->y + 75+24,
recommendedflags, "Modes marked in GREEN are recommended.");
/* /*
V_DrawCenteredString(BASEVIDWIDTH/2 + t, 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");