X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Ftarget_music.qc;h=a7a46d80ad5788c19e58e649c7d25c0a147b1376;hp=4ef9a37aeb47f80e518c899a14af583e2550dfc3;hb=98496b8f7cbb74f30232f5c52bb38158623bb597;hpb=0532cf8607bb25cebcf3c75d1748aa0b7df5d143

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index 4ef9a37ae..a7a46d80a 100644
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -4,12 +4,13 @@ entity music_target;
 entity music_trigger;
 
 .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 +18,10 @@ void TargetMusic_Advance()
 		best = music_trigger;
 	for(e = world; (e = findfloat(e, enttype, ENT_CLIENT_TRIGGER_MUSIC)); ) if(e.noise)
 	{
-		s0 = e.state;
+		vol0 = e.lastvol;
 		if(getsoundtime(e, CHAN_VOICE) < 0)
 		{
-			s0 = -1;
+			vol0 = -1;
 		}
 		if(e == best)
 		{
@@ -38,12 +39,14 @@ void TargetMusic_Advance()
 			else
 				e.state = 0;
 		}
-		if(e.state != s0)
+		vol = e.state * e.volume * cvar("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, CHAN_VOICE, e.noise, vol, ATTN_NONE); // restart
 			else
-				sound(e, CHAN_VOICE, "", e.volume * e.state * cvar("bgmvolume"), ATTN_NONE);
+				sound(e, CHAN_VOICE, "", vol, ATTN_NONE);
+			e.lastvol = vol;
 		}
 	}
 	music_trigger = world;
@@ -52,7 +55,7 @@ void TargetMusic_Advance()
 void Net_TargetMusic()
 {
 	float vol, fai, fao, tim, id;
-	string noi, s;
+	string noi;
 	entity e;
 
 	id = ReadShort();
@@ -71,13 +74,13 @@ void Net_TargetMusic()
 	{
 		e = spawn();
 		e.enttype = ENT_CLIENT_TRIGGER_MUSIC;
+		e.count = id;
 	}
-	s = e.noise;
-	if(e.noise)
-		strunzone(e.noise);
-	e.noise = strzone(noi);
-	if(e.noise != s)
+	if(e.noise != noi)
 	{
+		if(e.noise)
+			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)