Add "Set selected as default menu track" button

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 9503286d1c8fa59ab7a1446efa93588b51f8f127..d319c3582225bd5d8212d2e9f96a45ad63ce2e21 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1402,7 +1402,7 @@ cd remap $g_cdtracks_remaplist
 set sv_intermission_cdtrack ""
 
 set g_cdtracks_dontusebydefault "rising-of-the-phoenix"
-set menu_cdtrack "rising-of-the-phoenix"
+seta menu_cdtrack "rising-of-the-phoenix"
 
 // maxidle (in seconds): kick players idle for more than that amount of time
 set sv_maxidle 0

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c b/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c
index b2f72bca11454a9420cec0e0088772f7855d6b4e..00eec6ebeb3041c4f9a705b3feb06da88a0c4b66 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_musicplayer.c
@@ -41,7 +41,7 @@ void XonoticMusicPlayerTab_fill(entity me)
        me.TR(me);
                me.TD(me, me.rows - 4, me.columns, soundList);
 
-       me.gotoRC(me, me.rows - 1, 0);
+       me.gotoRC(me, me.rows - 2, 0);
                me.TD(me, 1, me.columns / 5, e = makeXonoticButton(ZCTX(_("MP^Stop")), '0 0 0'));
                        e.onClick = StopSound_Click;
                        e.onClickEntity = soundList;
@@ -57,5 +57,9 @@ void XonoticMusicPlayerTab_fill(entity me)
                me.TD(me, 1, me.columns / 5, e = makeXonoticButton(ZCTX(_("MP^Next")), '0 0 0'));
                        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'));
+                       e.onClick = SoundList_Menu_Track_Change;
+                       e.onClickEntity = soundList;
 }
 #endif

diff --git a/qcsrc/menu/xonotic/soundlist.c b/qcsrc/menu/xonotic/soundlist.c
index 32a35e3415d97dfd689691d2f28254e53bf75bc9..bb733a7df54a3273cd71553a57d73bba5af07dc7 100644 (file)
--- a/qcsrc/menu/xonotic/soundlist.c
+++ b/qcsrc/menu/xonotic/soundlist.c
@@ -34,6 +34,7 @@ void PauseSound_Click(entity btn, entity me);
 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);
 #endif
 
 #ifdef IMPLEMENTATION
@@ -132,6 +133,11 @@ void XonoticSoundList_showNotify(entity me)
        me.getSounds(me);
 }
 
+void SoundList_Menu_Track_Change(entity box, entity me)
+{
+       cvar_set("menu_cdtrack", me.soundName(me,me.selectedItem));
+}
+
 void SoundList_Filter_Change(entity box, entity me)
 {
        if(me.filterString)