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 6006aeb479e7c161f0d9488798b18131dd8ebcb4..662a673d7999f901922507b07bc2fe8b974564d3 100644 (file)
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -53,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)