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

* Fix music not being properly restored when toggling music on/off ingame. 

* Fix non-centiseconds rings position.
This commit is contained in:
toasterbabe 2017-09-25 20:35:04 +01:00
parent d38b627b85
commit 8ffec89207
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/m_menu.c
View File

@ -9425,7 +9425,10 @@ static void M_ToggleDigital(INT32 choice)
if (nodigimusic) return; if (nodigimusic) return;
S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value); S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
S_StopMusic(); S_StopMusic();
S_ChangeMusicInternal("_clear", false); if (Playing())
P_RestoreMusic(&players[consoleplayer]);
else
S_ChangeMusicInternal("_clear", false);
//M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING); //M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING);
} }
else else
@ -9433,7 +9436,10 @@ static void M_ToggleDigital(INT32 choice)
if (digital_disabled) if (digital_disabled)
{ {
digital_disabled = false; digital_disabled = false;
S_ChangeMusicInternal("_clear", false); if (Playing())
P_RestoreMusic(&players[consoleplayer]);
else
S_ChangeMusicInternal("_clear", false);
//M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING); //M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING);
} }
else else
@ -9475,7 +9481,10 @@ static void M_ToggleMIDI(INT32 choice)
I_InitMIDIMusic(); I_InitMIDIMusic();
if (nomidimusic) return; if (nomidimusic) return;
S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value); S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
S_ChangeMusicInternal("_clear", false); if (Playing())
P_RestoreMusic(&players[consoleplayer]);
else
S_ChangeMusicInternal("_clear", false);
//M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING); //M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING);
} }
else else
@ -9483,7 +9492,10 @@ static void M_ToggleMIDI(INT32 choice)
if (music_disabled) if (music_disabled)
{ {
music_disabled = false; music_disabled = false;
S_ChangeMusicInternal("_clear", false); if (Playing())
P_RestoreMusic(&players[consoleplayer]);
else
S_ChangeMusicInternal("_clear", false);
//M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING); //M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING);
} }
else else

2
src/st_stuff.c
View File

@ -132,7 +132,7 @@ hudinfo_t hudinfo[NUMHUDITEMS] =
{ 16, 42}, // HUD_RINGS { 16, 42}, // HUD_RINGS
{ 220, 10}, // HUD_RINGSSPLIT { 220, 10}, // HUD_RINGSSPLIT
{ 104, 42}, // HUD_RINGSNUM { 96, 42}, // HUD_RINGSNUM
{ 296, 10}, // HUD_RINGSNUMSPLIT { 296, 10}, // HUD_RINGSNUMSPLIT
{ 120, 42}, // HUD_RINGSNUMTICS { 120, 42}, // HUD_RINGSNUMTICS