[nexuiz-commits] r6454 - in trunk/data: . maps qcsrc/common sound/cdtracks

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-07 05:44:14 -0400 (Tue, 07 Apr 2009)
New Revision: 6454

Added:
   trunk/data/sound/cdtracks/brokenlight.ogg
   trunk/data/sound/cdtracks/stairs.ogg
Removed:
   trunk/data/sound/cdtracks/dn-refueled.xm
Modified:
   trunk/data/defaultHavoc.cfg
   trunk/data/defaultNexuiz.cfg
   trunk/data/maps/racetrack.mapinfo
   trunk/data/maps/ruiner.mapinfo
   trunk/data/maps/soylent.mapinfo
   trunk/data/nexuiz-credits.txt
   trunk/data/qcsrc/common/mapinfo.qc
   trunk/data/sound/cdtracks/beast-of-insanity.ogg
   trunk/data/sound/cdtracks/creation.ogg
   trunk/data/sound/cdtracks/thunder.ogg
Log:
-dn-refueled
+brokenlight
+stairs


Modified: trunk/data/defaultHavoc.cfg
===================================================================
--- trunk/data/defaultHavoc.cfg	2009-04-07 07:40:30 UTC (rev 6453)
+++ trunk/data/defaultHavoc.cfg	2009-04-07 09:44:14 UTC (rev 6454)
@@ -30,6 +30,7 @@
 set g_projectiles_newton_style 0
 seta menu_skin "simplygray"
 set menu_slist_modfilter "havoc"
+set menu_cdtrack creation
 
 exec physicsHavoc.cfg
 exec weaponsHavoc.cfg

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-04-07 07:40:30 UTC (rev 6453)
+++ trunk/data/defaultNexuiz.cfg	2009-04-07 09:44:14 UTC (rev 6454)
@@ -1244,9 +1244,11 @@
 set sv_foginterval 0
 
 // Audio track names (for old-style "cd loop NUMBER" usage)
-cd remap digital-pursuit breakdown-easy brainsukker chaos-fog infight neuronal-diving subcities thru-the-mirror calling-bogus beast-of-insanity
+set g_cdtracks_remaplist "digital-pursuit breakdown-easy brainsukker chaos-fog infight neuronal-diving subcities thru-the-mirror calling-bogus beast-of-insanity thunder creation brokenlight stairs dn-refueled.xm" "list used by mapinfo system to automatically assign cdtracks - must match the cd remap command"
+set g_cdtracks_dontusebydefault "digital-pursuit thunder brokenlight" "list used by mapinfo system to automatically assign cdtracks - must be a subset of g_cdtracks_remaplist"
+cd remap $g_cdtracks_remaplist
 set sv_intermission_cdtrack brainsukker
-set menu_cdtrack calling-bogus
+set menu_cdtrack brokenlight
 
 // maxidle (in seconds): kick players idle for more than that amount of time
 set sv_maxidle 0

Modified: trunk/data/maps/racetrack.mapinfo
===================================================================
--- trunk/data/maps/racetrack.mapinfo	2009-04-07 07:40:30 UTC (rev 6453)
+++ trunk/data/maps/racetrack.mapinfo	2009-04-07 09:44:14 UTC (rev 6454)
@@ -5,4 +5,4 @@
 _spawnpoints 0
 has weapons
 type race 5 20 15
-cdtrack dn-refueled.xm
+cdtrack 7

Modified: trunk/data/maps/ruiner.mapinfo
===================================================================
--- trunk/data/maps/ruiner.mapinfo	2009-04-07 07:40:30 UTC (rev 6453)
+++ trunk/data/maps/ruiner.mapinfo	2009-04-07 09:44:14 UTC (rev 6454)
@@ -9,6 +9,6 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
-cdtrack thunder
+cdtrack 11
 clientsettemp_for_type all r_shadow_glossexponent 96
 clientsettemp_for_type all r_shadow_glossintensity 2

Modified: trunk/data/maps/soylent.mapinfo
===================================================================
--- trunk/data/maps/soylent.mapinfo	2009-04-07 07:40:30 UTC (rev 6453)
+++ trunk/data/maps/soylent.mapinfo	2009-04-07 09:44:14 UTC (rev 6454)
@@ -10,4 +10,4 @@
 type rune 200 20
 type lms 9 20
 type arena 10 20
-cdtrack 6
+cdtrack 14

Modified: trunk/data/nexuiz-credits.txt
===================================================================
--- trunk/data/nexuiz-credits.txt	2009-04-07 07:40:30 UTC (rev 6453)
+++ trunk/data/nexuiz-credits.txt	2009-04-07 09:44:14 UTC (rev 6454)
@@ -88,6 +88,8 @@
 
 Gerd "Elysis" Raudenbusch - Music
 Braden "meoblast001" Walters - Music
+Michael "Tenshihan" Quinn - Music
+blkrbt - Music
 Amos "torus" Dudley - Announcer voices
 William "Willis" Weilep - Master server host
 Severin "sev" Meyer - Artist

Modified: trunk/data/qcsrc/common/mapinfo.qc
===================================================================
--- trunk/data/qcsrc/common/mapinfo.qc	2009-04-07 07:40:30 UTC (rev 6453)
+++ trunk/data/qcsrc/common/mapinfo.qc	2009-04-07 09:44:14 UTC (rev 6454)
@@ -542,7 +542,7 @@
 	string fn;
 	string s, t;
 	float fh, fh2;
-	float r, f;
+	float r, f, n, i;
 
 	if(strstrofs(pFilename, "/", 0) >= 0)
 	{
@@ -585,7 +585,17 @@
 				fputs(fh, strcat("cdtrack ", _MapInfo_Map_worldspawn_music, "\n"));
 		}
 		else
-			fputs(fh, strcat("cdtrack ", ftos(floor(random() * 9 + 2)), "\n")); // track from 2 to 10
+		{
+			n = tokenize_sane(cvar_string("g_cdtracks_remaplist"));
+			s = strcat(" ", cvar_string("g_cdtracks_dontusebydefault"), " ");
+			for(;;)
+			{
+				i = floor(random() * n);
+				if(strstrofs(s, strcat(" ", argv(i), " "), 0) < 0)
+					break;
+			}
+			fputs(fh, strcat("cdtrack ", ftos(i + 1), "\n"));
+		}
 		if(MapInfo_Map_supportedFeatures & MAPINFO_FEATURE_WEAPONS)    
 			fputs(fh, "has weapons\n");
 		else

Modified: trunk/data/sound/cdtracks/beast-of-insanity.ogg
===================================================================
(Binary files differ)

Added: trunk/data/sound/cdtracks/brokenlight.ogg
===================================================================
(Binary files differ)


Property changes on: trunk/data/sound/cdtracks/brokenlight.ogg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/sound/cdtracks/creation.ogg
===================================================================
(Binary files differ)

Deleted: trunk/data/sound/cdtracks/dn-refueled.xm
===================================================================
(Binary files differ)

Added: trunk/data/sound/cdtracks/stairs.ogg
===================================================================
(Binary files differ)


Property changes on: trunk/data/sound/cdtracks/stairs.ogg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/sound/cdtracks/thunder.ogg
===================================================================
(Binary files differ)