r5120 - trunk/data/qcsrc/common

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-11-27 08:15:59 -0500 (Thu, 27 Nov 2008)
New Revision: 5120

Modified:
   trunk/data/qcsrc/common/mapinfo.qc
Log:
mapinfo: don't write a "cdtrack" if the map has music set in worldspawn


Modified: trunk/data/qcsrc/common/mapinfo.qc
===================================================================
--- trunk/data/qcsrc/common/mapinfo.qc	2008-11-27 13:04:22 UTC (rev 5119)
+++ trunk/data/qcsrc/common/mapinfo.qc	2008-11-27 13:15:59 UTC (rev 5120)
@@ -306,6 +306,8 @@
 	return 0;
 }
 
+float _MapInfo_Map_has_worldspawn_music;
+
 float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 {
 	string fn;
@@ -336,6 +338,7 @@
 	inWorldspawn = 2;
 	MapInfo_Map_supportedGametypes = 0;
 	spawnpoints = 0;
+	_MapInfo_Map_has_worldspawn_music = 0;
 
 	for(;;)
 	{
@@ -354,6 +357,10 @@
 				MapInfo_Map_author = v;
 			else if(k == "_description")
 				MapInfo_Map_description = v;
+			else if(k == "music")
+				_MapInfo_Map_has_worldspawn_music = 1;
+			else if(k == "noise")
+				_MapInfo_Map_has_worldspawn_music = 1;
 			else if(k == "message")
 			{
 				i = strstrofs(v, " by ", 0);
@@ -559,7 +566,10 @@
 		fputs(fh, strcat("title ", MapInfo_Map_title, "\n"));
 		fputs(fh, strcat("description ", MapInfo_Map_description, "\n"));
 		fputs(fh, strcat("author ", MapInfo_Map_author, "\n"));
-		fputs(fh, strcat("cdtrack ", ftos(floor(random() * 9 + 2)), "\n")); // track from 2 to 10
+		if(_MapInfo_Map_has_worldspawn_music)
+			fputs(fh, strcat("// (uses worldspawn.music) // cdtrack ", ftos(floor(random() * 9 + 2)), "\n"));
+		else
+			fputs(fh, strcat("cdtrack ", ftos(floor(random() * 9 + 2)), "\n")); // track from 2 to 10
 		if(MapInfo_Map_supportedFeatures & MAPINFO_FEATURE_WEAPONS)       fputs(fh, "has weapons\n");
 		if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_DEATHMATCH)      fputs(fh, "type dm 30 20\n");
 		if(MapInfo_Map_supportedGametypes & MAPINFO_TYPE_TEAM_DEATHMATCH) fputs(fh, "type tdm 50 20 2\n");