Merge branch 'sev/legacy_char_replacement' into 'master'

[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 77cb2536eccad2d9e800b2f58695f049b0f5c81b..1d90a664c30c22ba29e37836437bea62ab87185d 100644 (file)
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -2,6 +2,7 @@ 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.
 
 .float state;
 .float lastvol;
@@ -43,9 +44,9 @@ void TargetMusic_Advance()
                if(vol != vol0)
                {
                        if(vol0 < 0)
-                               sound(e, CH_BGM_SINGLE, e.noise, vol, ATTN_NONE); // restart
+                               sound(e, CH_BGM_SINGLE, e.noise, vol, ATTEN_NONE); // restart
                        else
-                               sound(e, CH_BGM_SINGLE, "", vol, ATTN_NONE);
+                               sound(e, CH_BGM_SINGLE, "", vol, ATTEN_NONE);
                        e.lastvol = vol;
                }
        }
@@ -87,10 +88,10 @@ void Net_TargetMusic()
                        strunzone(e.noise);
                e.noise = strzone(noi);
                precache_sound(e.noise);
-               sound(e, CH_BGM_SINGLE, e.noise, 0, ATTN_NONE);
+               sound(e, CH_BGM_SINGLE, e.noise, 0, ATTEN_NONE);
                if(getsoundtime(e, CH_BGM_SINGLE) < 0)
                {
-                       print(sprintf(_("Cannot initialize sound %s\n"), e.noise));
+                       dprintf("Cannot initialize sound %s\n", e.noise);
                        strunzone(e.noise);
                        e.noise = string_null;
                }
@@ -176,10 +177,10 @@ void Ent_ReadTriggerMusic()
                if(self.noise != s)
                {
                        precache_sound(self.noise);
-                       sound(self, CH_BGM_SINGLE, self.noise, 0, ATTN_NONE);
+                       sound(self, CH_BGM_SINGLE, self.noise, 0, ATTEN_NONE);
                        if(getsoundtime(self, CH_BGM_SINGLE) < 0)
                        {
-                               print(sprintf(_("Cannot initialize sound %s\n"), self.noise));
+                               dprintf("Cannot initialize sound %s\n", self.noise);
                                strunzone(self.noise);
                                self.noise = string_null;
                        }