r3690 - in trunk/data: . maps qcsrc/menu qcsrc/server sound/cdtracks

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Jun 7 04:44:50 EDT 2008


Author: div0
Date: 2008-06-07 04:44:38 -0400 (Sat, 07 Jun 2008)
New Revision: 3690

Added:
   trunk/data/sound/cdtracks/beast-of-insanity.ogg
   trunk/data/sound/cdtracks/brainsukker.ogg
   trunk/data/sound/cdtracks/breakdown-easy.ogg
   trunk/data/sound/cdtracks/calling-bogus.ogg
   trunk/data/sound/cdtracks/chaos-fog.ogg
   trunk/data/sound/cdtracks/infight.ogg
   trunk/data/sound/cdtracks/neuronal-diving.ogg
   trunk/data/sound/cdtracks/subcities.ogg
   trunk/data/sound/cdtracks/thru-the-mirror.ogg
Removed:
   trunk/data/sound/cdtracks/track002.ogg
   trunk/data/sound/cdtracks/track003.ogg
   trunk/data/sound/cdtracks/track004.ogg
   trunk/data/sound/cdtracks/track005.ogg
   trunk/data/sound/cdtracks/track006.ogg
   trunk/data/sound/cdtracks/track007.ogg
   trunk/data/sound/cdtracks/track008.ogg
   trunk/data/sound/cdtracks/track009.ogg
Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/maps/silvercity.cfg
   trunk/data/nexuiz-credits.txt
   trunk/data/qcsrc/menu/menu.qc
   trunk/data/qcsrc/server/g_world.qc
Log:
- Rename CD track files to proper names
- Add meoblast001's track as track 10 "beast of insanity"
- Make silvercity use that track
- Make menu use cd track $menu_cdtrack
- Make intermission use cd track $sv_intermission_cdtrack (set on server; if empty, no track change is done when the scoreboard comes)

Only numbered CD track references left are the maps' mapname.cfg files. Should or should not get changed, not sure.


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-06-06 08:44:25 UTC (rev 3689)
+++ trunk/data/defaultNexuiz.cfg	2008-06-07 08:44:38 UTC (rev 3690)
@@ -1012,3 +1012,8 @@
 
 set menu_mouse_absolute 0 // TODO make this seta if the engine understands this right
 seta menu_mouse_speed 1
+
+// Audio track names (for old-style "cd loop NUMBER" usage)
+cd remap 1 breakdown-easy brainsukker chaos-fog infight neuronal-diving subcities thru-the-mirror calling-bogus beast-of-insanity
+set sv_intermission_cdtrack brainsukker
+set menu_cdtrack 1

Modified: trunk/data/maps/silvercity.cfg
===================================================================
--- trunk/data/maps/silvercity.cfg	2008-06-06 08:44:25 UTC (rev 3689)
+++ trunk/data/maps/silvercity.cfg	2008-06-07 08:44:38 UTC (rev 3690)
@@ -1 +1 @@
-cd loop "7"
+cd loop "10"

Modified: trunk/data/nexuiz-credits.txt
===================================================================
--- trunk/data/nexuiz-credits.txt	2008-06-06 08:44:25 UTC (rev 3689)
+++ trunk/data/nexuiz-credits.txt	2008-06-07 08:44:38 UTC (rev 3690)
@@ -72,6 +72,7 @@
 **Thanks:
 
 Gerd "Elysis" Raudenbusch - Music
+Braden "meoblast001" Walters - Music
 Amos "torus" Dudley - Announcer voices
 William "Willis" Weilep - Master server host
 Tyler "-z-" Mulligan - Site Design

Modified: trunk/data/qcsrc/menu/menu.qc
===================================================================
--- trunk/data/qcsrc/menu/menu.qc	2008-06-06 08:44:25 UTC (rev 3689)
+++ trunk/data/qcsrc/menu/menu.qc	2008-06-07 08:44:38 UTC (rev 3690)
@@ -211,7 +211,7 @@
 		if(Menu_Active)
 		if(!cvar("menu_video_played"))
 		{
-			localcmd("set menu_video_played 1; cd loop 1; play sound/announcer/male/welcome.ogg\n");
+			localcmd("set menu_video_played 1; cd loop $menu_cdtrack; play sound/announcer/male/welcome.ogg\n");
 			menuLogoAlpha = -0.8; // no idea why, but when I start this at zero, it jumps instead of fading
 		}
 	}

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-06-06 08:44:25 UTC (rev 3689)
+++ trunk/data/qcsrc/server/g_world.qc	2008-06-07 08:44:38 UTC (rev 3690)
@@ -994,6 +994,7 @@
 
 void FixIntermissionClient(entity e)
 {
+	string s;
 	if(!e.autoscreenshot) // initial call
 	{
 		e.angles = e.v_angle;
@@ -1006,9 +1007,12 @@
 		e.takedamage = DAMAGE_NO;
 		if(e.weaponentity)
 			e.weaponentity.effects = EF_NODRAW;
-		stuffcmd(e, "\nscr_printspeed 1000000\n");
 		if(clienttype(e) == CLIENTTYPE_REAL)
 		{
+			stuffcmd(e, "\nscr_printspeed 1000000\n");
+			s = cvar_string("sv_intermission_cdtrack");
+			if(s != "")
+				stuffcmd(e, strcat("\ncd loop ", s, "\n"));
 			msg_entity = e;
 			WriteByte(MSG_ONE, SVC_INTERMISSION);
 		}
@@ -1042,9 +1046,12 @@
 	else
 		intermission_exittime = -1;
 
+	/*
 	WriteByte (MSG_ALL, SVC_CDTRACK);
 	WriteByte (MSG_ALL, 3);
 	WriteByte (MSG_ALL, 3);
+	// done in FixIntermission
+	*/
 
 	//pos = FindIntermission ();
 

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


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

Copied: trunk/data/sound/cdtracks/brainsukker.ogg (from rev 3688, trunk/data/sound/cdtracks/track003.ogg)
===================================================================
(Binary files differ)

Copied: trunk/data/sound/cdtracks/breakdown-easy.ogg (from rev 3688, trunk/data/sound/cdtracks/track002.ogg)
===================================================================
(Binary files differ)

Copied: trunk/data/sound/cdtracks/calling-bogus.ogg (from rev 3688, trunk/data/sound/cdtracks/track009.ogg)
===================================================================
(Binary files differ)

Copied: trunk/data/sound/cdtracks/chaos-fog.ogg (from rev 3688, trunk/data/sound/cdtracks/track004.ogg)
===================================================================
(Binary files differ)

Copied: trunk/data/sound/cdtracks/infight.ogg (from rev 3688, trunk/data/sound/cdtracks/track005.ogg)
===================================================================
(Binary files differ)

Copied: trunk/data/sound/cdtracks/neuronal-diving.ogg (from rev 3688, trunk/data/sound/cdtracks/track006.ogg)
===================================================================
(Binary files differ)

Copied: trunk/data/sound/cdtracks/subcities.ogg (from rev 3688, trunk/data/sound/cdtracks/track007.ogg)
===================================================================
(Binary files differ)

Copied: trunk/data/sound/cdtracks/thru-the-mirror.ogg (from rev 3688, trunk/data/sound/cdtracks/track008.ogg)
===================================================================
(Binary files differ)

Deleted: trunk/data/sound/cdtracks/track002.ogg
===================================================================
(Binary files differ)

Deleted: trunk/data/sound/cdtracks/track003.ogg
===================================================================
(Binary files differ)

Deleted: trunk/data/sound/cdtracks/track004.ogg
===================================================================
(Binary files differ)

Deleted: trunk/data/sound/cdtracks/track005.ogg
===================================================================
(Binary files differ)

Deleted: trunk/data/sound/cdtracks/track006.ogg
===================================================================
(Binary files differ)

Deleted: trunk/data/sound/cdtracks/track007.ogg
===================================================================
(Binary files differ)

Deleted: trunk/data/sound/cdtracks/track008.ogg
===================================================================
(Binary files differ)

Deleted: trunk/data/sound/cdtracks/track009.ogg
===================================================================
(Binary files differ)




More information about the nexuiz-commits mailing list