Remove some leftovers from merge

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / target_music.qc

diff --git a/qcsrc/server/target_music.qc b/qcsrc/server/target_music.qc
index 94bc92f69ceaed1d8af9775bf9de5a4d057269fc..681a4ca6d194bb1586447743c4ef8f70b8e48d01 100644 (file)
--- a/qcsrc/server/target_music.qc
+++ b/qcsrc/server/target_music.qc
@@ -1,13 +1,6 @@
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../common/constants.qh"
-    #include "constants.qh"
-    #include "defs.qh"
-#endif
+#include "_all.qh"
 
+.float volume;
 .float lifetime;
 // values:
 //   volume
@@ -75,7 +68,7 @@ void TargetMusic_RestoreGame()
 // spawnflags:
 //   1 = START_OFF
 // when triggered, it is disabled/enabled for everyone
-float trigger_music_SendEntity(entity to, float sf)
+float trigger_music_SendEntity(entity to, int sf)
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_TRIGGER_MUSIC);
        sf &= ~0x80;