stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-01 06:00:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

hghdfhdjhdhkdlfh

Browse source
This commit is contained in:
Jaime Passos 2019-08-19 15:34:12 -03:00
parent 94e21c7b03
commit 15957bf13f
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/m_menu.c
View file

@ -7840,7 +7840,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
UINT8 *colormap = NULL; UINT8 *colormap = NULL;
INT32 prev = -1, next = -1; INT32 prev = -1, next = -1;
INT32 fade = 0, fade2 = 0; INT32 fade = 0;
patch_t *charbg = W_CachePatchName("CHARBG", PU_CACHE); patch_t *charbg = W_CachePatchName("CHARBG", PU_CACHE);
patch_t *charfg = W_CachePatchName("CHARFG", PU_CACHE); patch_t *charfg = W_CachePatchName("CHARFG", PU_CACHE);
INT32 bgheight = charbg->height; INT32 bgheight = charbg->height;
@ -7860,17 +7860,11 @@ static void M_DrawSetupChoosePlayerMenu(void)
// No fade for this frame // No fade for this frame
if (charseltimer >= TICRATE) if (charseltimer >= TICRATE)
{
fade = 10; fade = 10;
fade2 = 0;
}
// Fading in, or out // Fading in, or out
// Calculate the fade amount (0-9) // Calculate the fade amount (0-9)
else else
{
fade = FixedMul(10*FRACUNIT, FixedDiv((charseltimer*4) * FRACUNIT, TICRATE * FRACUNIT)) >> FRACBITS; fade = FixedMul(10*FRACUNIT, FixedDiv((charseltimer*4) * FRACUNIT, TICRATE * FRACUNIT)) >> FRACBITS;
fade2 = (fade <= 9) ? fade<<V_ALPHASHIFT : 0;
}
if (abs(char_scroll) > FRACUNIT) if (abs(char_scroll) > FRACUNIT)
char_scroll -= (char_scroll>>2); char_scroll -= (char_scroll>>2);
@ -7946,13 +7940,13 @@ static void M_DrawSetupChoosePlayerMenu(void)
{ {
INT32 oy = (i*bgheight), y; INT32 oy = (i*bgheight), y;
y = oy - (bgheight - (charseltimer%bgheight)); y = oy - (bgheight - (charseltimer%bgheight));
V_DrawFixedPatch(0, y<<FRACBITS, FRACUNIT, fade2<<V_ALPHASHIFT, charbg, colormap); V_DrawFixedPatch(0, y<<FRACBITS, FRACUNIT, 0, charbg, colormap);
} }
for (i = -12; i < (BASEVIDHEIGHT/fgheight) + 12; i++) for (i = -12; i < (BASEVIDHEIGHT/fgheight) + 12; i++)
{ {
INT32 oy = (i*fgheight), y; INT32 oy = (i*fgheight), y;
y = oy - (fgheight + (charseltimer%fgheight)); y = oy - (fgheight + (charseltimer%fgheight));
V_DrawFixedPatch(0, y<<FRACBITS, FRACUNIT, fade2<<V_ALPHASHIFT, charfg, colormap); V_DrawFixedPatch(0, y<<FRACBITS, FRACUNIT, 0, charfg, colormap);
} }
} }
@ -7990,21 +7984,21 @@ static void M_DrawSetupChoosePlayerMenu(void)
{ {
// Why does this work? // Why does this work?
x = (ox - txsh) - BASEVIDWIDTH; x = (ox - txsh) - BASEVIDWIDTH;
V_DrawScaledPatch(x-xsh, y, fade2<<V_ALPHASHIFT, prevpatch); V_DrawScaledPatch(x-xsh, y, 0, prevpatch);
} }
// next // next
else if (nextpatch && char_scroll > 0) else if (nextpatch && char_scroll > 0)
{ {
x = (ox - txsh) + BASEVIDWIDTH; x = (ox - txsh) + BASEVIDWIDTH;
if (x < BASEVIDWIDTH) if (x < BASEVIDWIDTH)
V_DrawScaledPatch(x-xsh, y, fade2<<V_ALPHASHIFT, nextpatch); V_DrawScaledPatch(x-xsh, y, 0, nextpatch);
} }
} }
// cur // cur
x = ox - txsh; x = ox - txsh;
if (curpatch) if (curpatch)
V_DrawScaledPatch(x-xsh, y, fade2<<V_ALPHASHIFT, curpatch); V_DrawScaledPatch(x-xsh, y, 0, curpatch);
} }
} }