OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- migrate a large part of the sound code to FSoundIDs.

Browse source 
This has always been a wild mixture of IDs and ints.
This commit is contained in:
Christoph Oelckers 2022-11-24 15:22:07 +01:00
commit 160633a4a2
35 changed files with 224 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/playsim/p_enemy.cpp
View file

@ -1963,7 +1963,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_Look)
if (self->reactiontime > self->Level->maptime)
self->target = nullptr;
}
else if (self->SeeSound)
else if (self->SeeSound.isvalid())
{
if ((self->flags2 & MF2_BOSS) || (self->flags8 & MF8_FULLVOLSEE))
{ // full volume
@ -2145,7 +2145,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_LookEx)
if (self->reactiontime > self->Level->maptime)
self->target = nullptr;
}
else if (self->SeeSound && !(flags & LOF_NOSEESOUND))
else if (self->SeeSound.isvalid() && !(flags & LOF_NOSEESOUND))
{
if (flags & LOF_FULLVOLSEESOUND)
{ // full volume
@ -2574,7 +2574,7 @@ void A_DoChase (AActor *actor, bool fastchase, FState *meleestate, FState *missi
// check for melee attack
if (meleestate && P_CheckMeleeRange(actor))
{
if (actor->AttackSound)
if (actor->AttackSound.isvalid())
S_Sound (actor, CHAN_WEAPON, 0, actor->AttackSound, 1, ATTN_NORM);
actor->SetState (meleestate);
@ -2836,7 +2836,7 @@ bool P_CheckForResurrection(AActor* self, bool usevilestates, FState* state = nu
self->SetState(archvile->FindState(NAME_Heal));
}
}
if (sound == 0) sound = "vile/raise";
if (sound == NO_SOUND) sound = "vile/raise";
S_Sound(corpsehit, CHAN_BODY, 0, sound, 1, ATTN_IDLE);
info = corpsehit->GetDefault();
@ -3132,7 +3132,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_Pain)
pain_sound += '-';
pain_sound += self->player->LastDamageType.GetChars();
sfx_id = pain_sound;
if (sfx_id == 0)
if (sfx_id == NO_SOUND)
{
// Try again without a specific pain amount.
pain_sound = "*pain-";
@ -3140,14 +3140,14 @@ DEFINE_ACTION_FUNCTION(AActor, A_Pain)
sfx_id = pain_sound;
}
}
if (sfx_id == 0)
if (sfx_id == NO_SOUND)
{
sfx_id = pain_amount;
}
S_Sound (self, CHAN_VOICE, 0, sfx_id, 1, ATTN_NORM);
}
else if (self->PainSound)
else if (self->PainSound.isvalid())
{
S_Sound (self, CHAN_VOICE, 0, self->PainSound, 1, ATTN_NORM);
}