- Fixed: Cheats in demos must not access the weapon slots.
- Fixed: S_ChannelEnded didn't check for a NULL SfxInfo. - Fixed: R_InitTables did a typecast to angle_t instead of fixed_t. - Fixed: PowerProtection and PowerDamage applied their defaults incorrectly. - Fixed: The damage type property didn't properly read its factor. SVN r1257 (trunk)
This commit is contained in:
parent
7b82745665
commit
402d0e5fa1
6 changed files with 36 additions and 13 deletions
|
|
@ -1854,8 +1854,8 @@ void S_ChannelEnded(FISoundChannel *ichan)
|
|||
{
|
||||
evicted = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
else if (schan->SfxInfo != NULL)
|
||||
{
|
||||
unsigned int pos = GSnd->GetPosition(schan);
|
||||
unsigned int len = GSnd->GetSampleLength(schan->SfxInfo->data);
|
||||
if (pos == 0)
|
||||
|
|
@ -1867,6 +1867,10 @@ void S_ChannelEnded(FISoundChannel *ichan)
|
|||
evicted = (pos < len);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
evicted = false;
|
||||
}
|
||||
if (!evicted)
|
||||
{
|
||||
S_ReturnChannel(schan);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue