From e6eac8cd3d8dda525a089d402fdca6a822f49c17 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 29 Nov 2019 03:31:50 -0800 Subject: [PATCH] Revert "More intuitive menu for music resync option" This reverts commit ee78597a42b4e5edf5b22466682b9a00da6bcecf. --- src/m_menu.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index f5d34fc0a..a3dac710d 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1378,7 +1378,7 @@ static menuitem_t OP_SoundOptionsMenu[] = {IT_STRING|IT_CVAR, NULL, "Play Music While Unfocused", &cv_playmusicifunfocused, 125}, {IT_STRING|IT_CVAR, NULL, "Play SFX While Unfocused", &cv_playsoundifunfocused, 135}, - {IT_STRING|IT_CVAR|IT_CV_NOPRINT, NULL, "Music Resynch Threshold", &cv_music_resync_threshold, 150}, + {IT_STRING|IT_CVAR, NULL, "Music Resynch Threshold (MS)", &cv_music_resync_threshold, 150}, }; static menuitem_t OP_DataOptionsMenu[] = @@ -6417,23 +6417,12 @@ static void M_DrawSkyRoom(void) (midi_disabled ? warningflags : highlightflags), (midi_disabled ? "OFF" : "ON"));*/ - V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, - currentMenu->y+currentMenu->menuitems[12].alphaKey, - highlightflags, - ( (cv_music_resync_threshold.value) ? - va("%s MS", cv_music_resync_threshold.string) : "OFF" )); - if (itemOn == 0) lengthstring = 8*(sound_disabled ? 3 : 2); else if (itemOn == 2) lengthstring = 8*(digital_disabled ? 3 : 2); /*else if (itemOn == 5) lengthstring = 8*(midi_disabled ? 3 : 2);*/ - else if (itemOn == 12) - { - lengthstring = 8*( (cv_music_resync_threshold.value) ? - strlen(cv_music_resync_threshold.string) + 3 : 3 ); - } } for (i = 0; i < currentMenu->numitems; ++i)