client part first half

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 15f230d7f0a5fe4d308948ec0c82a06c36c002ef..e039ce46dcda8777ed171f7c5a7df158e1b891b9 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -49,6 +49,7 @@ effects.qc
 wall.qc
 modeleffects.qc
 tuba.qc
+target_music.qc
 
 //vehicles/spiderbot.qc
 Main.qc

diff --git a/qcsrc/server/target_music.qc b/qcsrc/server/target_music.qc
index 34a8ffb537f2b6930d6fb61024410a54f8631e30..c5b7d181ed4481a43de310336816bf5b15e01f3c 100644 (file)
--- a/qcsrc/server/target_music.qc
+++ b/qcsrc/server/target_music.qc
@@ -11,11 +11,13 @@ void target_music_sendto(float to)
        WriteByte(to, TE_CSQC_TARGET_MUSIC);
        WriteByte(to, self.volume * 255.0);
        WriteByte(to, self.fade_time * 16.0);
+       WriteByte(to, self.timeout);
        WriteString(to, self.noise);
 }
 void target_music_reset()
 {
-       target_music_sendto(MSG_ALL);
+       if(self.targetname == "")
+               target_music_sendto(MSG_ALL);
 }
 void target_music_use()
 {
@@ -31,7 +33,8 @@ void spawnfunc_target_music()
        precache_sound(self.noise);
        if(!self.volume)
                self.volume = 1;
-       target_music_sendto(MSG_INIT);
+       if(self.targetname == "")
+               target_music_sendto(MSG_INIT);
 }
 // values:
 //   volume