Add "Reset default menu track" button

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c b/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c
index 00eec6ebeb3041c4f9a705b3feb06da88a0c4b66..6d7b2d943da83dd7a6c11e0079935751ca92ca3b 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c
@@ -58,8 +58,11 @@ void XonoticMusicPlayerTab_fill(entity me)
                        e.onClick = NextSound_Click;
                        e.onClickEntity = soundList;
        me.TR(me);
-               me.TD(me, 1, me.columns, e = makeXonoticButton(_("Set selected as default menu track"), '0 0 0'));
+               me.TD(me, 1, me.columns / 2, e = makeXonoticButton(_("Set selected as menu track"), '0 0 0'));
                        e.onClick = SoundList_Menu_Track_Change;
                        e.onClickEntity = soundList;
+               me.TD(me, 1, me.columns / 2, e = makeXonoticButton(_("Reset default menu track"), '0 0 0'));
+                       e.onClick = SoundList_Menu_Track_Reset;
+                       e.onClickEntity = soundList;
 }
 #endif

diff --git a/qcsrc/menu/xonotic/soundlist.c b/qcsrc/menu/xonotic/soundlist.c
index bb733a7df54a3273cd71553a57d73bba5af07dc7..18e0ba6742f43fc0da94915de0b92ba78b62b479 100644 (file)
--- a/qcsrc/menu/xonotic/soundlist.c
+++ b/qcsrc/menu/xonotic/soundlist.c
@@ -35,6 +35,7 @@ void PrevSound_Click(entity btn, entity me);
 void NextSound_Click(entity btn, entity me);
 void SoundList_Filter_Change(entity box, entity me);
 void SoundList_Menu_Track_Change(entity box, entity me);
+void SoundList_Menu_Track_Reset(entity box, entity me);
 #endif
 
 #ifdef IMPLEMENTATION
@@ -124,6 +125,11 @@ void XonoticSoundList_drawListBoxItem(entity me, float i, vector absSize, float
        }
 
        s = me.soundName(me,i);
+       if(s == cvar_defstring("menu_cdtrack"))
+               s = strcat(s, " [default menu track]");
+       else if(s == cvar_string("menu_cdtrack"))
+               s = strcat(s, " [current menu track]");
+       s = strcat(ftos(i+1), ") ", s);
        s = draw_TextShortenToWidth(s, me.columnNameSize, 0, me.realFontSize);
        draw_Text(me.realUpperMargin * eY + me.columnNameOrigin * eX, s, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
 }
@@ -138,6 +144,11 @@ void SoundList_Menu_Track_Change(entity box, entity me)
        cvar_set("menu_cdtrack", me.soundName(me,me.selectedItem));
 }
 
+void SoundList_Menu_Track_Reset(entity box, entity me)
+{
+       cvar_set("menu_cdtrack", cvar_defstring("menu_cdtrack"));
+}
+
 void SoundList_Filter_Change(entity box, entity me)
 {
        if(me.filterString)