OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- separated the channel number from the flags in the sound interface so that the 8 channel limit can be eliminated.

Browse source 
- added Marisa Kirisame's CHAN_OVERLAP flag.
- exported S_IsActorPlayingSomething to ZScript.

The sound API change required deprecating A_PlaySound and S_Sound. There are now new variants S_StartSound and A_StartSound which have two distinct parameters for channel and flags.
This commit is contained in:
Christoph Oelckers 2019-12-16 23:52:39 +01:00
commit e82565373f
43 changed files with 339 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/playsim/p_user.cpp
View file

@ -892,11 +892,11 @@ DEFINE_ACTION_FUNCTION(AActor, A_PlayerScream)
{
if (self->DeathSound != 0)
{
S_Sound (self, CHAN_VOICE, self->DeathSound, 1, ATTN_NORM);
S_Sound (self, CHAN_VOICE, 0, self->DeathSound, 1, ATTN_NORM);
}
else
{
S_Sound (self, CHAN_VOICE, "*death", 1, ATTN_NORM);
S_Sound (self, CHAN_VOICE, 0, "*death", 1, ATTN_NORM);
}
return 0;
}
@ -946,7 +946,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_PlayerScream)
}
}
}
S_Sound (self, chan, sound, 1, ATTN_NORM);
S_Sound (self, chan, 0, sound, 1, ATTN_NORM);
return 0;
}
@ -1094,7 +1094,7 @@ void P_FallingDamage (AActor *actor)
if (actor->player)
{
S_Sound (actor, CHAN_AUTO, "*land", 1, ATTN_NORM);
S_Sound (actor, CHAN_AUTO, 0, "*land", 1, ATTN_NORM);
P_NoiseAlert (actor, actor, true);
if (damage >= TELEFRAG_DAMAGE && ((actor->player->cheats & (CF_GODMODE | CF_BUDDHA) ||
(actor->FindInventory(PClass::FindActor(NAME_PowerBuddha), true) != nullptr))))
@ -1170,7 +1170,7 @@ void P_CheckEnvironment(player_t *player)
int id = S_FindSkinnedSound(player->mo, "*falling");
if (id != 0 && !S_IsActorPlayingSomething(player->mo, CHAN_VOICE, id))
{
S_Sound(player->mo, CHAN_VOICE, id, 1, ATTN_NORM);
S_Sound(player->mo, CHAN_VOICE, 0, id, 1, ATTN_NORM);
}
}
}