From: Mario <mario@smbclan.net>
Date: Sat, 7 Nov 2015 09:07:46 +0000 (+1000)
Subject: Accept multiple arguments for sv_intermission_cdtrack
X-Git-Tag: xonotic-v0.8.2~1694
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=27e09e084b49e843cc312296fc0d677e25b5e84e;p=xonotic%2Fxonotic-data.pk3dir.git

Accept multiple arguments for sv_intermission_cdtrack
---

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 6f3b56d77..16a78fd6d 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1459,7 +1459,6 @@ void DumpStats(float final)
 
 void FixIntermissionClient(entity e)
 {
-	string s;
 	if(!e.autoscreenshot) // initial call
 	{
 		e.autoscreenshot = time + 0.8;	// used for autoscreenshot
@@ -1481,9 +1480,11 @@ void FixIntermissionClient(entity e)
 		if(IS_REAL_CLIENT(e))
 		{
 			stuffcmd(e, "\nscr_printspeed 1000000\n");
-			s = autocvar_sv_intermission_cdtrack;
-			if(s != "")
-				stuffcmd(e, strcat("\ncd loop ", s, "\n"));
+			string list = autocvar_sv_intermission_cdtrack;
+			for(string it; (it = car(list)); list = cdr(list))
+				RandomSelection_Add(world, 0, it, 1, 1);
+			if(RandomSelection_chosen_string && RandomSelection_chosen_string != "")
+				stuffcmd(e, strcat("\ncd loop ", RandomSelection_chosen_string, "\n"));
 			msg_entity = e;
 			WriteByte(MSG_ONE, SVC_INTERMISSION);
 		}