vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

:shitsfree:

Browse source
This commit is contained in:
toaster 2018-09-20 17:45:09 +01:00
parent f425ba4423
commit e90139c5b3
3 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/m_menu.c
View file

@ -8516,6 +8516,8 @@ static consvar_t *kartitemcvs[NUMKARTRESULTS-1] = {
&cv_dualjawz &cv_dualjawz
}; };
static tic_t shitsfree = 0;
static void M_DrawMonitorToggles(void) static void M_DrawMonitorToggles(void)
{ {
const INT32 edges = 4; const INT32 edges = 4;
@ -8632,7 +8634,18 @@ static void M_DrawMonitorToggles(void)
{ {
#ifdef ITEMTOGGLEBOTTOMRIGHT #ifdef ITEMTOGGLEBOTTOMRIGHT
if (currentMenu->menuitems[itemOn].alphaKey == 255) if (currentMenu->menuitems[itemOn].alphaKey == 255)
{
V_DrawScaledPatch(onx-1, ony-2, V_TRANSLUCENT, W_CachePatchName("K_ITBG", PU_CACHE)); V_DrawScaledPatch(onx-1, ony-2, V_TRANSLUCENT, W_CachePatchName("K_ITBG", PU_CACHE));
if (shitsfree)
{
INT32 trans = V_TRANSLUCENT;
if (shitsfree-1 > TICRATE-5)
trans = ((10-TICRATE)+shitsfree-1)<<V_ALPHASHIFT;
else if (shitsfree < 5)
trans = (10-shitsfree)<<V_ALPHASHIFT;
V_DrawScaledPatch(onx-1, ony-2, trans, W_CachePatchName("K_ITFREE", PU_CACHE));
}
}
else else
#endif #endif
if (currentMenu->menuitems[itemOn].alphaKey == 0) if (currentMenu->menuitems[itemOn].alphaKey == 0)
@ -8679,6 +8692,9 @@ static void M_DrawMonitorToggles(void)
} }
} }
if (shitsfree)
shitsfree--;
V_DrawCenteredString(BASEVIDWIDTH/2, currentMenu->y, highlightflags, va("* %s *", currentMenu->menuitems[itemOn].text)); V_DrawCenteredString(BASEVIDWIDTH/2, currentMenu->y, highlightflags, va("* %s *", currentMenu->menuitems[itemOn].text));
} }
@ -8739,7 +8755,14 @@ static void M_HandleMonitorToggles(INT32 choice)
case KEY_ENTER: case KEY_ENTER:
#ifdef ITEMTOGGLEBOTTOMRIGHT #ifdef ITEMTOGGLEBOTTOMRIGHT
if (currentMenu->menuitems[itemOn].alphaKey == 255) if (currentMenu->menuitems[itemOn].alphaKey == 255)
S_StartSound(NULL, sfx_lose); {
//S_StartSound(NULL, sfx_lose);
if (!shitsfree)
{
shitsfree = TICRATE;
S_StartSound(NULL, sfx_itfree);
}
}
else else
#endif #endif
if (currentMenu->menuitems[itemOn].alphaKey == 0) if (currentMenu->menuitems[itemOn].alphaKey == 0)

1
src/sounds.c
View file

@ -813,6 +813,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"hogbom", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"hogbom", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR},
{"kpogos", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"kpogos", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR},
{"ddash", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"ddash", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"itfree", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"dbgsal", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR}, {"dbgsal", false, 110, 8, -1, NULL, 0, -1, -1, LUMPERROR},
// SRB2kart - Skin sounds // SRB2kart - Skin sounds

1
src/sounds.h
View file

@ -885,6 +885,7 @@ typedef enum
sfx_hogbom, sfx_hogbom,
sfx_kpogos, sfx_kpogos,
sfx_ddash, sfx_ddash,
sfx_itfree,
sfx_dbgsal, sfx_dbgsal,
sfx_kwin, sfx_kwin,