Merge commit 'origin/master' into divVerent/tag_seeker

[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 58649bf1fa6cc7291eeefb6257f2dfb63b4d3096..4ef9a37aeb47f80e518c899a14af583e2550dfc3 100644 (file)
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -1,10 +1,11 @@
+float music_disabled;
 entity music_default;
 entity music_target;
 entity music_trigger;
 
 .float state;
 
-void Net_AdvanceMusic()
+void TargetMusic_Advance()
 {
        // run AFTER all the thinks!
        entity best, e;
@@ -14,14 +15,18 @@ void Net_AdvanceMusic()
                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;
+               if(getsoundtime(e, CHAN_VOICE) < 0)
+               {
+                       s0 = -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,12 +34,17 @@ void Net_AdvanceMusic()
                {
                        // decrease volume
                        if(e.fade_rate > 0)
-                               e.state = max(1, 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)
-                       sound(e, CHAN_VOICE, "", e.volume * e.state, ATTN_NONE);
+               {
+                       if(s0 < 0)
+                               sound(e, CHAN_VOICE, e.noise, e.volume * e.state * cvar("bgmvolume"), ATTN_NONE); // restart
+                       else
+                               sound(e, CHAN_VOICE, "", e.volume * e.state * cvar("bgmvolume"), ATTN_NONE);
+               }
        }
        music_trigger = world;
 }
@@ -42,7 +52,7 @@ void Net_AdvanceMusic()
 void Net_TargetMusic()
 {
        float vol, fai, fao, tim, id;
-       string noi;
+       string noi, s;
        entity e;
 
        id = ReadShort();
@@ -61,10 +71,21 @@ void Net_TargetMusic()
        {
                e = spawn();
                e.enttype = ENT_CLIENT_TRIGGER_MUSIC;
-               if(e.noise)
+       }
+       s = e.noise;
+       if(e.noise)
+               strunzone(e.noise);
+       e.noise = strzone(noi);
+       if(e.noise != s)
+       {
+               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 = strzone(noi);
-               sound(e, CHAN_VOICE, self.noise, 0, ATTN_NONE);
+                       e.noise = string_null;
+               }
        }
        e.volume = vol;
        e.fade_time = fai;
@@ -74,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
                {
@@ -86,7 +113,9 @@ void Net_TargetMusic()
 void Ent_TriggerMusic_Think()
 {
        if(WarpZoneLib_BoxTouchesBrush(view_origin, view_origin, self, world))
+       {
                music_trigger = self;
+       }
        self.nextthink = time;
 }
 
@@ -100,6 +129,7 @@ void Ent_TriggerMusic_Remove()
 void Ent_ReadTriggerMusic()
 {
        float f;
+       string s;
        f = ReadByte();
        if(f & 4)
        {
@@ -130,11 +160,25 @@ void Ent_ReadTriggerMusic()
                self.volume = ReadByte() / 255.0;
                self.fade_time = ReadByte() / 16.0;
                self.fade_rate = ReadByte() / 16.0;
+               s = self.noise;
                if(self.noise)
                        strunzone(self.noise);
                self.noise = strzone(ReadString());
+               if(self.noise != s)
+               {
+                       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;
+                       }
+               }
        }
 
+       setorigin(self, self.origin);
+       setsize(self, self.mins, self.maxs);
        self.cnt = 1;
        self.think = Ent_TriggerMusic_Think;
        self.nextthink = time;