From: Mario <mario@smbclan.net>
Date: Tue, 6 Aug 2019 08:12:56 +0000 (+1000)
Subject: Disable trigger_music when the match ends, so it doesn't overlap with the intermissio... 
X-Git-Tag: xonotic-v0.8.5~1426
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f94638066254e02edc4ad88320ea952150f32ce5;p=xonotic%2Fxonotic-data.pk3dir.git

Disable trigger_music when the match ends, so it doesn't overlap with the intermission cdtrack
---

diff --git a/qcsrc/common/mapobjects/target/music.qc b/qcsrc/common/mapobjects/target/music.qc
index 5a63872db..55ccf41fb 100644
--- a/qcsrc/common/mapobjects/target/music.qc
+++ b/qcsrc/common/mapobjects/target/music.qc
@@ -272,7 +272,7 @@ void Net_TargetMusic()
 
 void Ent_TriggerMusic_Think(entity this)
 {
-	if(this.active == ACTIVE_NOT)
+	if(this.active == ACTIVE_NOT || intermission)
 	{
 		return;
 	}