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

Addons menu refactor part 2

Browse source 
- Change M_DrawAddons to draw relatively, so that the height can be changed without consequence.
- Add an option to adjust the spacing of Addons Menu entries (currently unused, but could be explored later).
- Moved Search (still not yet functional) further up the menu.
This commit is contained in:
toaster 2022-09-03 19:43:13 +01:00
parent 8312f12d6c
commit 88f04da180
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/k_menudraw.c
View file

@ -4266,6 +4266,7 @@ static void M_CacheAddonPatches(void)
addonsp[NUM_EXT+4] = W_CachePatchName("M_FSAVE", PU_STATIC); addonsp[NUM_EXT+4] = W_CachePatchName("M_FSAVE", PU_STATIC);
} }
#define addonsseperation 16
void M_DrawAddons(void) void M_DrawAddons(void)
{ {
@ -4308,11 +4309,25 @@ void M_DrawAddons(void)
hilicol = V_GetStringColormap(highlightflags)[0]; hilicol = V_GetStringColormap(highlightflags)[0];
V_DrawString(x-21, (y - 16) + (lsheadingheight - 12), highlightflags|V_ALLOWLOWERCASE, M_AddonsHeaderPath()); y -= 16;
V_DrawFill(x-21, (y - 16) + (lsheadingheight - 3), MAXSTRINGLENGTH*8+6, 1, hilicol);
V_DrawFill(x-21, (y - 16) + (lsheadingheight - 2), MAXSTRINGLENGTH*8+6, 1, 30);
m = (BASEVIDHEIGHT - currentMenu->y + 2) - (y - 1); V_DrawString(x-21, y + (lsheadingheight - 12), highlightflags|V_ALLOWLOWERCASE, 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);
y += 10;
M_DrawTextBox(x - (21 + 5), y, MAXSTRINGLENGTH, 1);
if (menusearch[0])
V_DrawString(x - 18, y+8, V_ALLOWLOWERCASE, menusearch+1);
else
V_DrawString(x - 18, y+8, V_ALLOWLOWERCASE|V_TRANSLUCENT, "Type to search...");
V_DrawSmallScaledPatch(x - (21 + 5 + 16), y+4, (menusearch[0] ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+3]);
y += 21;
m = (addonsseperation*(2*numaddonsshown + 1)) + 2*(16-addonsseperation);
V_DrawFill(x - 21, y - 1, MAXSTRINGLENGTH*8+6, m, 159); V_DrawFill(x - 21, y - 1, MAXSTRINGLENGTH*8+6, m, 159);
// scrollbar! // scrollbar!
@ -4352,6 +4367,8 @@ void M_DrawAddons(void)
if (skullAnimCounter < 4) if (skullAnimCounter < 4)
flashcol = V_GetStringColormap(highlightflags); flashcol = V_GetStringColormap(highlightflags);
y -= (16-addonsseperation);
for (; i < m; i++) for (; i < m; i++)
{ {
UINT32 flags = V_ALLOWLOWERCASE; UINT32 flags = V_ALLOWLOWERCASE;
@ -4382,7 +4399,7 @@ void M_DrawAddons(void)
V_DrawString(x, y+4, flags, dirmenu[i]+DIR_STRING); V_DrawString(x, y+4, flags, dirmenu[i]+DIR_STRING);
} }
#undef type #undef type
y += 16; y += addonsseperation;
} }
if (m != (ssize_t)sizedirmenu) if (m != (ssize_t)sizedirmenu)
@ -4390,21 +4407,11 @@ void M_DrawAddons(void)
y = BASEVIDHEIGHT - currentMenu->y + 1; y = BASEVIDHEIGHT - currentMenu->y + 1;
M_DrawTextBox(x - (21 + 5), y, MAXSTRINGLENGTH, 1); x = BASEVIDWIDTH - (x - (21 + 5 + 16)) - 16;
if (menusearch[0])
V_DrawString(x - 18, y + 8, V_ALLOWLOWERCASE, menusearch+1);
else
V_DrawString(x - 18, y + 8, V_ALLOWLOWERCASE|V_TRANSLUCENT, "Type to search...");
if (skullAnimCounter < 4)
V_DrawCharacter(x - 18 + V_StringWidth(menusearch+1, 0), y + 8,
'_' | 0x80, false);
x -= (21 + 5 + 16);
V_DrawSmallScaledPatch(x, y + 4, (menusearch[0] ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+3]);
x = BASEVIDWIDTH - x - 16;
V_DrawSmallScaledPatch(x, y + 4, ((!majormods) ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+4]); V_DrawSmallScaledPatch(x, y + 4, ((!majormods) ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+4]);
if (modifiedgame) if (modifiedgame)
V_DrawSmallScaledPatch(x, y + 4, 0, addonsp[NUM_EXT+2]); V_DrawSmallScaledPatch(x, y + 4, 0, addonsp[NUM_EXT+2]);
} }
#undef addonsseperation