X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Ftarget_music.qc;h=f30e77af424007e8aebd4d8805c1fea2e19359f8;hb=8a44cef6e025ab6f878cba5c20c35e138f0bdfe4;hp=34d19dc02779c43b1ed027bc6fb7e66a8aff44b5;hpb=fef280899c7d1bb27078da823b0a64843b2f1129;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index 34d19dc02..f30e77af4 100644
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -2,14 +2,16 @@ 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;
 
 void TargetMusic_Advance()
 {
 	// run AFTER all the thinks!
 	entity best, e;
-	float s0;
+	float vol, vol0;
 	best = music_default;
 	if(music_target && time < music_target.lifetime)
 		best = music_target;
@@ -17,10 +19,10 @@ void TargetMusic_Advance()
 		best = music_trigger;
 	for(e = world; (e = findfloat(e, enttype, ENT_CLIENT_TRIGGER_MUSIC)); ) if(e.noise)
 	{
-		s0 = e.state;
-		if(getsoundtime(e, CHAN_VOICE) < 0)
+		vol0 = e.lastvol;
+		if(getsoundtime(e, CH_BGM_SINGLE) < 0)
 		{
-			s0 = -1;
+			vol0 = -1;
 		}
 		if(e == best)
 		{
@@ -38,15 +40,22 @@ void TargetMusic_Advance()
 			else
 				e.state = 0;
 		}
-		if(e.state != s0)
+		vol = e.state * e.volume * autocvar_bgmvolume;
+		if(vol != vol0)
 		{
-			if(s0 < 0)
-				sound(e, CHAN_VOICE, e.noise, e.volume * e.state * cvar("bgmvolume"), ATTN_NONE); // restart
+			if(vol0 < 0)
+				sound(e, CH_BGM_SINGLE, e.noise, vol, ATTEN_NONE); // restart
 			else
-				sound(e, CHAN_VOICE, "", e.volume * e.state * cvar("bgmvolume"), ATTN_NONE);
+				sound(e, CH_BGM_SINGLE, "", vol, ATTEN_NONE);
+			e.lastvol = vol;
 		}
 	}
 	music_trigger = world;
+
+	if(best)
+		bgmtime = getsoundtime(best, CH_BGM_SINGLE);
+	else
+		bgmtime = gettime(GETTIME_CDTRACK);
 }
 
 void Net_TargetMusic()
@@ -79,10 +88,10 @@ void Net_TargetMusic()
 			strunzone(e.noise);
 		e.noise = strzone(noi);
 		precache_sound(e.noise);
-		sound(e, CHAN_VOICE, e.noise, 0, ATTN_NONE);
-		if(getsoundtime(e, CHAN_VOICE) < 0)
+		sound(e, CH_BGM_SINGLE, e.noise, 0, ATTEN_NONE);
+		if(getsoundtime(e, CH_BGM_SINGLE) < 0)
 		{
-			print("Cannot initialize sound ", e.noise, "\n");
+			print(sprintf(_("Cannot initialize sound %s\n"), e.noise));
 			strunzone(e.noise);
 			e.noise = string_null;
 		}
@@ -98,6 +107,7 @@ void Net_TargetMusic()
 			if(!music_disabled)
 			{
 				e.state = 2;
+				cvar_settemp("music_playlist_index", "-1"); // don't use playlists
 				localcmd("cd stop\n"); // just in case
 				music_disabled = 1;
 			}
@@ -167,10 +177,10 @@ void Ent_ReadTriggerMusic()
 		if(self.noise != s)
 		{
 			precache_sound(self.noise);
-			sound(self, CHAN_VOICE, self.noise, 0, ATTN_NONE);
-			if(getsoundtime(self, CHAN_VOICE) < 0)
+			sound(self, CH_BGM_SINGLE, self.noise, 0, ATTEN_NONE);
+			if(getsoundtime(self, CH_BGM_SINGLE) < 0)
 			{
-				print("Cannot initialize sound ", self.noise, "\n");
+				print(sprintf(_("Cannot initialize sound %s\n"), self.noise));
 				strunzone(self.noise);
 				self.noise = string_null;
 			}