Merge branch 'master' into Mario/turrets

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

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index 87a48136eeb7b5d6c86dffcf21785bb4beb87857..662a673d7999f901922507b07bc2fe8b974564d3 100644 (file)
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -1,24 +1,4 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qc"
-       #include "Defs.qc"
-       #include "../common/constants.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../common/util.qh"
-       #include "autocvars.qh"
-       #include "main.qh"
-       #include "../csqcmodellib/cl_model.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
-float music_disabled;
-entity music_default;
-entity music_target;
-entity music_trigger;
-// FIXME also control bgmvolume here, to not require a target_music for the default track.
-
-.int state;
-.float lastvol;
+#include "target_music.qh"
 
 void TargetMusic_Advance()
 {
@@ -73,17 +53,14 @@ void TargetMusic_Advance()
 
 void Net_TargetMusic()
 {
-       float vol, fai, fao, tim, id;
-       string noi;
-       entity e;
-
-       id = ReadShort();
-       vol = ReadByte() / 255.0;
-       fai = ReadByte() / 16.0;
-       fao = ReadByte() / 16.0;
-       tim = ReadByte();
-       noi = ReadString();
+       int id = ReadShort();
+       float vol = ReadByte() / 255.0;
+       float fai = ReadByte() / 16.0;
+       float fao = ReadByte() / 16.0;
+       float tim = ReadByte();
+       string noi = ReadString();
 
+       entity e;
        for(e = world; (e = findfloat(e, enttype, ENT_CLIENT_TRIGGER_MUSIC)); )
        {
                if(e.count == id)