From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 6 May 2010 05:23:47 +0000 (+0200)
Subject: turn off autogenerated cdtrack line of target_music is used
X-Git-Tag: xonotic-v0.1.0preview~640^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e42c7f4d55471022b6ac58966e6d27254c733e67;p=xonotic%2Fxonotic-data.pk3dir.git

turn off autogenerated cdtrack line of target_music is used
---

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 003377e8c..53a07186b 100644
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -324,6 +324,8 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp
 					{ }
 				else if(startsWith(v, "weapon_"))
 					MapInfo_Map_supportedFeatures |= MAPINFO_FEATURE_WEAPONS;
+				else if(v == "target_music" || v == "trigger_music")
+					_MapInfo_Map_worldspawn_music = string_null; // don't use regular BGM
 			}
 		}
 	}
@@ -630,7 +632,7 @@ float MapInfo_Get_ByName(string pFilename, float pAllowGenerate, float pGametype
 			else
 				fputs(fh, strcat("cdtrack ", _MapInfo_Map_worldspawn_music, "\n"));
 		}
-		else
+		else if(_MapInfo_Map_worldspawn_music)
 		{
 			n = tokenize_console(cvar_string("g_cdtracks_remaplist"));
 			s = strcat(" ", cvar_string("g_cdtracks_dontusebydefault"), " ");