From ac92712d44f753323e53f7196525a3b0786b5ce3 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 6 May 2010 19:53:29 +0200 Subject: [PATCH] slightly better music state handling --- qcsrc/client/target_music.qc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 { -- 2.39.2