Merge branch 'master' into Lyberta/WaypointIcons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mapobjects / target / music.qc

diff --git a/qcsrc/common/mapobjects/target/music.qc b/qcsrc/common/mapobjects/target/music.qc
index 5a63872dbd6c46b6742b3534be7b4531c0d38ef2..30413c0c658f19dcf1e4b4bba86f440578203e73 100644 (file)
--- a/qcsrc/common/mapobjects/target/music.qc
+++ b/qcsrc/common/mapobjects/target/music.qc
@@ -4,8 +4,8 @@
 #elif defined(SVQC)
     #include <common/constants.qh>
     #include <common/net_linked.qh>
-    #include <server/constants.qh>
-    #include <server/defs.qh>
+    #include <common/weapons/_all.qh>
+    #include <common/stats.qh>
 #endif
 
 REGISTER_NET_TEMP(TE_CSQC_TARGET_MUSIC)
@@ -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;
        }