cl_movement: move crouch handling so that sv_maxairspeed*0.5 is maximum crouching...

[xonotic/darkplaces.git] / snd_main.c

diff --git a/snd_main.c b/snd_main.c
index 943dc5d19fc73ccbebf69711483aaf9106eac4e8..e4a4934a2993458f8044e4bbd6e51e2fa3e00de8 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -1191,7 +1191,7 @@ channel_t *SND_PickChannel(int entnum, int entchannel)
                {
                        // no sound on this channel
                        first_to_die = ch_idx;
-                       break;
+                       goto emptychan_found;
                }
 
                // don't let monster sounds override player sounds
@@ -1212,7 +1212,10 @@ channel_t *SND_PickChannel(int entnum, int entchannel)
 
        if (first_to_die == -1)
                return NULL;
+       
+       S_StopChannel (first_to_die, true);
 
+emptychan_found:
        return &channels[first_to_die];
 }
 
@@ -1595,6 +1598,22 @@ void S_SetChannelVolume (unsigned int ch_ind, float fvol)
        channels[ch_ind].master_vol = (int)(fvol * 255.0f);
 }
 
+float S_GetChannelPosition (unsigned int ch_ind)
+{
+       // note: this is NOT accurate yet
+       int s;
+       channel_t *ch = &channels[ch_ind];
+       sfx_t *sfx = ch->sfx;
+
+       s = ch->pos;
+       /*
+       if(!snd_usethreadedmixing)
+               s += _snd_mixahead.value * S_GetSoundRate();
+       */
+       return (s % sfx->total_length) / (float) S_GetSoundRate();
+}
+
+
 
 /*
 =================