Some random fixes and stuff (centerprints converted to notifications, less spam when...

[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 75f77acf53b77beb9e0fc9274dcabec0f8c3307c..cd1b374e6b247fab04cf6d8d85cfea5f67c7da6f 100644 (file)
--- a/qcsrc/server/target_music.qc
+++ b/qcsrc/server/target_music.qc
@@ -28,8 +28,13 @@ void target_music_use()
 {
        if(!activator)
                return;
-       msg_entity = activator;
-       target_music_sendto(MSG_ONE, 1);
+       if(IS_REAL_CLIENT(activator))
+       {
+               msg_entity = activator;
+               target_music_sendto(MSG_ONE, 1);
+       }
+       entity head;
+       FOR_EACH_SPEC(head) if(head.enemy == activator) { msg_entity = head; target_music_sendto(MSG_ONE, 1); }
 }
 void spawnfunc_target_music()
 {
@@ -42,6 +47,16 @@ void spawnfunc_target_music()
        else
                target_music_sendto(MSG_INIT, 0);
 }
+void TargetMusic_RestoreGame()
+{
+       for(self = world; (self = find(self, classname, "target_music")); )
+       {
+               if(self.targetname == "")
+                       target_music_sendto(MSG_INIT, 1);
+               else
+                       target_music_sendto(MSG_INIT, 0);
+       }
+}
 // values:
 //   volume
 //   noise
@@ -53,7 +68,7 @@ void spawnfunc_target_music()
 float trigger_music_SendEntity(entity to, float sf)
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_TRIGGER_MUSIC);
-       sf &~= 0x80;
+       sf &= ~0x80;
        if(self.cnt)
                sf |= 0x80;
        WriteByte(MSG_ENTITY, sf);