X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Ftarget_music.qc;h=c4573296a6bb0af9f35dedf39ae177855fc847bb;hb=68eb8d499b3e9b32c46ea77cd2f284af61a690c1;hp=909b75ea3fa8aba5acb3738dac648f212a6d8ee7;hpb=70b696e4e2bbe7322bf580be42961b2d5a159f31;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc index 909b75ea3..c4573296a 100644 --- a/qcsrc/client/target_music.qc +++ b/qcsrc/client/target_music.qc @@ -19,7 +19,7 @@ void TargetMusic_Advance() for(e = world; (e = findfloat(e, enttype, ENT_CLIENT_TRIGGER_MUSIC)); ) if(e.noise) { vol0 = e.lastvol; - if(getsoundtime(e, CH_BGM) < 0) + if(getsoundtime(e, CH_BGM_SINGLE) < 0) { vol0 = -1; } @@ -43,16 +43,16 @@ void TargetMusic_Advance() if(vol != vol0) { if(vol0 < 0) - csound(e, CH_BGM, e.noise, vol, ATTN_NONE); // restart + sound(e, CH_BGM_SINGLE, e.noise, vol, ATTN_NONE); // restart else - csound(e, CH_BGM, "", vol, ATTN_NONE); + sound(e, CH_BGM_SINGLE, "", vol, ATTN_NONE); e.lastvol = vol; } } music_trigger = world; if(best) - bgmtime = getsoundtime(best, CH_BGM); + bgmtime = getsoundtime(best, CH_BGM_SINGLE); else bgmtime = gettime(GETTIME_CDTRACK); } @@ -87,8 +87,8 @@ void Net_TargetMusic() strunzone(e.noise); e.noise = strzone(noi); precache_sound(e.noise); - csound(e, CH_BGM, e.noise, 0, ATTN_NONE); - if(getsoundtime(e, CH_BGM) < 0) + sound(e, CH_BGM_SINGLE, e.noise, 0, ATTN_NONE); + if(getsoundtime(e, CH_BGM_SINGLE) < 0) { print(sprintf(_("Cannot initialize sound %s\n"), e.noise)); strunzone(e.noise); @@ -175,8 +175,8 @@ void Ent_ReadTriggerMusic() if(self.noise != s) { precache_sound(self.noise); - csound(self, CH_BGM, self.noise, 0, ATTN_NONE); - if(getsoundtime(self, CH_BGM) < 0) + sound(self, CH_BGM_SINGLE, self.noise, 0, ATTN_NONE); + if(getsoundtime(self, CH_BGM_SINGLE) < 0) { print(sprintf(_("Cannot initialize sound %s\n"), self.noise)); strunzone(self.noise);