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

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index c4573296a..f30e77af4 100644
--- 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,7 +88,7 @@ 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));
@@ -106,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;
 			}
@@ -175,7 +177,7 @@ 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));