OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed GC barriers from the sound channels. If we must, we can always

Browse source 
do it the old way and scan every channel to see if it matches an actor/
  entchannel pair.
- Fixed: S_RelinkSounds() did not move the SoundChans bitfield to the new
  actor.
- Fixed: Stolen channels could be kept around by the high-level channels
  indefinitely.


SVN r1289 (trunk)
This commit is contained in:
Randy Heit 2008-11-15 01:01:04 +00:00
commit 3b4479df44
5 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/s_sound.cpp
View file

@ -1057,7 +1057,7 @@ static FSoundChan *S_StartSound(AActor *actor, const sector_t *sec, const FPolyO
chan->SourceType = type;
switch (type)
{
case SOURCE_Actor: chan->Actor = actor; actor->SoundChans |= 1 << channel; GC::WriteBarrier(actor); break;
case SOURCE_Actor: chan->Actor = actor; actor->SoundChans |= 1 << channel; break;
case SOURCE_Sector: chan->Sector = sec; break;
case SOURCE_Polyobj: chan->Poly = poly; break;
case SOURCE_Unattached: chan->Point[0] = pt->X; chan->Point[1] = pt->Y; chan->Point[2] = pt->Z; break;
@ -1497,7 +1497,6 @@ void S_RelinkSound (AActor *from, AActor *to)
if (to != NULL)
{
chan->Actor = to;
GC::WriteBarrier(to);
}
else if (!(chan->ChanFlags & CHAN_LOOP))
{
@ -1509,11 +1508,15 @@ void S_RelinkSound (AActor *from, AActor *to)
}
else
{
chan->Actor = NULL;
S_StopChannel(chan);
}
}
}
if (to != NULL)
{
to->SoundChans = from->SoundChans;
}
from->SoundChans = 0;
}
//==========================================================================
@ -1698,6 +1701,10 @@ void S_RestoreEvictedChannel(FSoundChan *chan)
}
}
}
else if (chan->SysChannel == NULL && (chan->ChanFlags & (CHAN_FORGETTABLE | CHAN_LOOP)) == CHAN_FORGETTABLE)
{
S_ReturnChannel(chan);
}
}
//==========================================================================