mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 12:31:54 +00:00
Merge branch 'opengl-character-select-mipmap-memory-leak-fix' into 'next'
Fix colormap mipmap memory leak on the character select in OpenGL See merge request STJr/SRB2!943
This commit is contained in:
commit
8e6ead4a2a
1 changed files with 7 additions and 7 deletions
14
src/m_menu.c
14
src/m_menu.c
|
|
@ -9097,7 +9097,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
|
||||||
col = Color_Opposite[charskin->prefcolor - 1][0];
|
col = Color_Opposite[charskin->prefcolor - 1][0];
|
||||||
|
|
||||||
// Make the translation colormap
|
// Make the translation colormap
|
||||||
colormap = R_GetTranslationColormap(TC_DEFAULT, col, 0);
|
colormap = R_GetTranslationColormap(TC_DEFAULT, col, GTC_CACHE);
|
||||||
|
|
||||||
// Don't render the title map
|
// Don't render the title map
|
||||||
hidetitlemap = true;
|
hidetitlemap = true;
|
||||||
|
|
@ -9173,8 +9173,8 @@ static void M_DrawSetupChoosePlayerMenu(void)
|
||||||
{
|
{
|
||||||
V_DrawNameTag(
|
V_DrawNameTag(
|
||||||
x, y, V_CENTERNAMETAG, FRACUNIT,
|
x, y, V_CENTERNAMETAG, FRACUNIT,
|
||||||
R_GetTranslationColormap(TC_DEFAULT, curtextcolor, 0),
|
R_GetTranslationColormap(TC_DEFAULT, curtextcolor, GTC_CACHE),
|
||||||
R_GetTranslationColormap(TC_DEFAULT, curoutlinecolor, 0),
|
R_GetTranslationColormap(TC_DEFAULT, curoutlinecolor, GTC_CACHE),
|
||||||
curtext
|
curtext
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -9206,8 +9206,8 @@ static void M_DrawSetupChoosePlayerMenu(void)
|
||||||
{
|
{
|
||||||
V_DrawNameTag(
|
V_DrawNameTag(
|
||||||
x, y, V_CENTERNAMETAG, FRACUNIT,
|
x, y, V_CENTERNAMETAG, FRACUNIT,
|
||||||
R_GetTranslationColormap(TC_DEFAULT, prevtextcolor, 0),
|
R_GetTranslationColormap(TC_DEFAULT, prevtextcolor, GTC_CACHE),
|
||||||
R_GetTranslationColormap(TC_DEFAULT, prevoutlinecolor, 0),
|
R_GetTranslationColormap(TC_DEFAULT, prevoutlinecolor, GTC_CACHE),
|
||||||
prevtext
|
prevtext
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -9236,8 +9236,8 @@ static void M_DrawSetupChoosePlayerMenu(void)
|
||||||
{
|
{
|
||||||
V_DrawNameTag(
|
V_DrawNameTag(
|
||||||
x, y, V_CENTERNAMETAG, FRACUNIT,
|
x, y, V_CENTERNAMETAG, FRACUNIT,
|
||||||
R_GetTranslationColormap(TC_DEFAULT, nexttextcolor, 0),
|
R_GetTranslationColormap(TC_DEFAULT, nexttextcolor, GTC_CACHE),
|
||||||
R_GetTranslationColormap(TC_DEFAULT, nextoutlinecolor, 0),
|
R_GetTranslationColormap(TC_DEFAULT, nextoutlinecolor, GTC_CACHE),
|
||||||
nexttext
|
nexttext
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue