From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 6 May 2010 17:53:29 +0000 (+0200)
Subject: slightly better music state handling
X-Git-Tag: xonotic-v0.1.0preview~640^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ac92712d44f753323e53f7196525a3b0786b5ce3;p=xonotic%2Fxonotic-data.pk3dir.git

slightly better music state handling
---

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index 0d8b10626..4ef9a37ae 100644
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -1,3 +1,4 @@
+float music_disabled;
 entity music_default;
 entity music_target;
 entity music_trigger;
@@ -25,7 +26,7 @@ void TargetMusic_Advance()
 		{
 			// increase volume
 			if(e.fade_time > 0)
-				e.state = min(1, e.state + frametime / e.fade_time);
+				e.state = bound(0, e.state + frametime / e.fade_time, 1);
 			else
 				e.state = 1;
 		}
@@ -33,7 +34,7 @@ void TargetMusic_Advance()
 		{
 			// decrease volume
 			if(e.fade_rate > 0)
-				e.state = max(0, e.state - frametime / e.fade_rate);
+				e.state = bound(0, e.state - frametime / e.fade_rate, 1);
 			else
 				e.state = 0;
 		}
@@ -94,6 +95,12 @@ void Net_TargetMusic()
 		if(tim == 0)
 		{
 			music_default = e;
+			if(!music_disabled)
+			{
+				e.state = 2;
+				localcmd("cd stop\n"); // just in case
+				music_disabled = 1;
+			}
 		}
 		else
 		{