From 8ffec8920718eb8a15570f85e9be9d485dbb1634 Mon Sep 17 00:00:00 2001 From: toasterbabe Date: Mon, 25 Sep 2017 20:35:04 +0100 Subject: [PATCH] * Fix music not being properly restored when toggling music on/off ingame. * Fix non-centiseconds rings position. --- src/m_menu.c | 20 ++++++++++++++++---- src/st_stuff.c | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index fe768fce3..12bab3b0c 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -9425,7 +9425,10 @@ static void M_ToggleDigital(INT32 choice) if (nodigimusic) return; S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value); 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); } else @@ -9433,7 +9436,10 @@ static void M_ToggleDigital(INT32 choice) if (digital_disabled) { 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); } else @@ -9475,7 +9481,10 @@ static void M_ToggleMIDI(INT32 choice) I_InitMIDIMusic(); if (nomidimusic) return; 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); } else @@ -9483,7 +9492,10 @@ static void M_ToggleMIDI(INT32 choice) if (music_disabled) { 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); } else diff --git a/src/st_stuff.c b/src/st_stuff.c index 889eeb57d..09d63963f 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -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