Merge remote branch 'origin/fruitiex/fruitbalance'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / target_music.qc

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index 97faf67900d73b77b54cc69b99949c656cbdb133..a7a46d80ad5788c19e58e649c7d25c0a147b1376 100644 (file)
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -1,27 +1,33 @@
+float music_disabled;
 entity music_default;
 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;
        if(music_trigger)
                best = music_trigger;
-       for(e = world; (e = findfloat(e, enttype, ENT_CLIENT_TRIGGER_MUSIC)); )
+       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)
+               {
+                       vol0 = -1;
+               }
                if(e == best)
                {
                        // 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;
                }
@@ -29,13 +35,18 @@ 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;
                }
-               if(e.state != s0)
+               vol = e.state * e.volume * cvar("bgmvolume");
+               if(vol != vol0)
                {
-                       sound(e, CHAN_VOICE, "", e.volume * e.state * cvar("bgmvolume"), ATTN_NONE);
+                       if(vol0 < 0)
+                               sound(e, CHAN_VOICE, e.noise, vol, ATTN_NONE); // restart
+                       else
+                               sound(e, CHAN_VOICE, "", vol, ATTN_NONE);
+                       e.lastvol = vol;
                }
        }
        music_trigger = world;
@@ -44,7 +55,7 @@ void TargetMusic_Advance()
 void Net_TargetMusic()
 {
        float vol, fai, fao, tim, id;
-       string noi, s;
+       string noi;
        entity e;
 
        id = ReadShort();
@@ -63,15 +74,21 @@ 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)
+               {
+                       print("Cannot initialize sound ", e.noise, "\n");
+                       strunzone(e.noise);
+                       e.noise = string_null;
+               }
        }
        e.volume = vol;
        e.fade_time = fai;
@@ -81,6 +98,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
                {
@@ -148,6 +171,12 @@ void Ent_ReadTriggerMusic()
                {
                        precache_sound(self.noise);
                        sound(self, CHAN_VOICE, self.noise, 0, ATTN_NONE);
+                       if(getsoundtime(self, CHAN_VOICE) < 0)
+                       {
+                               print("Cannot initialize sound ", self.noise, "\n");
+                               strunzone(self.noise);
+                               self.noise = string_null;
+                       }
                }
        }