* Fix music not being properly restored when toggling music on/off ingame.
* Fix non-centiseconds rings position.
This commit is contained in:
parent
d38b627b85
commit
8ffec89207
12
src/m_menu.c
12
src/m_menu.c
|
@ -9425,6 +9425,9 @@ static void M_ToggleDigital(INT32 choice)
|
|||
if (nodigimusic) return;
|
||||
S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
|
||||
S_StopMusic();
|
||||
if (Playing())
|
||||
P_RestoreMusic(&players[consoleplayer]);
|
||||
else
|
||||
S_ChangeMusicInternal("_clear", false);
|
||||
//M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING);
|
||||
}
|
||||
|
@ -9433,6 +9436,9 @@ static void M_ToggleDigital(INT32 choice)
|
|||
if (digital_disabled)
|
||||
{
|
||||
digital_disabled = false;
|
||||
if (Playing())
|
||||
P_RestoreMusic(&players[consoleplayer]);
|
||||
else
|
||||
S_ChangeMusicInternal("_clear", false);
|
||||
//M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING);
|
||||
}
|
||||
|
@ -9475,6 +9481,9 @@ static void M_ToggleMIDI(INT32 choice)
|
|||
I_InitMIDIMusic();
|
||||
if (nomidimusic) return;
|
||||
S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
|
||||
if (Playing())
|
||||
P_RestoreMusic(&players[consoleplayer]);
|
||||
else
|
||||
S_ChangeMusicInternal("_clear", false);
|
||||
//M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING);
|
||||
}
|
||||
|
@ -9483,6 +9492,9 @@ static void M_ToggleMIDI(INT32 choice)
|
|||
if (music_disabled)
|
||||
{
|
||||
music_disabled = false;
|
||||
if (Playing())
|
||||
P_RestoreMusic(&players[consoleplayer]);
|
||||
else
|
||||
S_ChangeMusicInternal("_clear", false);
|
||||
//M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING);
|
||||
}
|
||||
|
|
|
@ -132,7 +132,7 @@ hudinfo_t hudinfo[NUMHUDITEMS] =
|
|||
|
||||
{ 16, 42}, // HUD_RINGS
|
||||
{ 220, 10}, // HUD_RINGSSPLIT
|
||||
{ 104, 42}, // HUD_RINGSNUM
|
||||
{ 96, 42}, // HUD_RINGSNUM
|
||||
{ 296, 10}, // HUD_RINGSNUMSPLIT
|
||||
{ 120, 42}, // HUD_RINGSNUMTICS
|
||||
|
||||
|
|
Loading…
Reference in New Issue