remove some stuff I forgot about

This commit is contained in:
Bill Currie 2007-03-21 14:37:16 +00:00 committed by Jeff Teunissen
parent 2d6f8c6501
commit 04639c7ab8

View file

@ -111,12 +111,14 @@ SND_AllocChannel (void)
void
SND_ChannelStop (channel_t *chan)
{
chan->stop = 1;
chan->free = 1;
/* if chan->next is set, then this channel has already been freed. just
deal with it gracefully.
FIXME this is really a workaround for a problem in the interaction with
cd_file.c
*/
if (!chan->next) {
chan->stop = 1;
chan->free = 1;
chan->next = free_channels;
free_channels = chan;
}
@ -311,19 +313,11 @@ s_pick_channel (int entnum, int entchannel, int looped)
}
_ch = &(*_ch)->next;
}
for (count = 0, _ch = &dynamic_channels; *_ch; count++)
_ch = &(*_ch)->next;
for (count = 0, _ch = &looped_dynamic_channels; *_ch; count++)
_ch = &(*_ch)->next;
_ch = looped ? &looped_dynamic_channels : &dynamic_channels;
if ((ch = SND_AllocChannel ())) {
ch->next = *_ch;
*_ch = ch;
}
for (count = 0, _ch = &dynamic_channels; *_ch; count++)
_ch = &(*_ch)->next;
for (count = 0, _ch = &looped_dynamic_channels; *_ch; count++)
_ch = &(*_ch)->next;
return ch;
}