lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Sound always happens on SoundOptions menu now. It was weird not having those.

Browse source
This commit is contained in:
toasterbabe 2017-04-18 12:32:06 +01:00
parent fbdc8d3d9e
commit 528132ad6d
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/m_menu.c
View file

@ -2403,8 +2403,7 @@ boolean M_Responder(event_t *ev)
if (routine && ((currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_ARROWS if (routine && ((currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_ARROWS
|| (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_CVAR)) || (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_CVAR))
{ {
if (currentMenu != &OP_SoundOptionsDef) S_StartSound(NULL, sfx_menu1);
S_StartSound(NULL, sfx_menu1);
routine(0); routine(0);
} }
return true; return true;
@ -2413,8 +2412,7 @@ boolean M_Responder(event_t *ev)
if (routine && ((currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_ARROWS if (routine && ((currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_ARROWS
|| (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_CVAR)) || (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_CVAR))
{ {
if (currentMenu != &OP_SoundOptionsDef) S_StartSound(NULL, sfx_menu1);
S_StartSound(NULL, sfx_menu1);
routine(1); routine(1);
} }
return true; return true;
@ -7702,7 +7700,7 @@ static void M_DrawControl(void)
} }
else if (currentMenu->menuitems[i].status == IT_GRAYEDOUT2) else if (currentMenu->menuitems[i].status == IT_GRAYEDOUT2)
V_DrawString(x, y, V_TRANSLUCENT, currentMenu->menuitems[i].text); V_DrawString(x, y, V_TRANSLUCENT, currentMenu->menuitems[i].text);
else if (currentMenu->menuitems[i].status == IT_HEADER) else if ((currentMenu->menuitems[i].status == IT_HEADER) && (i != max-1))
M_DrawLevelPlatterHeader(y, currentMenu->menuitems[i].text, true); M_DrawLevelPlatterHeader(y, currentMenu->menuitems[i].text, true);
y += SMALLLINEHEIGHT; y += SMALLLINEHEIGHT;