OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed the string constructors from FSoundID.

Browse source 
Due to C++ conversion rules this was a bit too volatile. There's really not enough places where being able to pass a string directly into the sound API was beneficial - the two most frequent functions now got overloaded variants.
This commit is contained in:
Christoph Oelckers 2022-11-24 16:49:04 +01:00
commit 65a26d6779
26 changed files with 66 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/playsim/p_enemy.cpp
View file

@ -2836,7 +2836,7 @@ bool P_CheckForResurrection(AActor* self, bool usevilestates, FState* state = nu
self->SetState(archvile->FindState(NAME_Heal));
}
}
if (sound == NO_SOUND) sound = "vile/raise";
if (sound == NO_SOUND) sound = S_FindSound("vile/raise");
S_Sound(corpsehit, CHAN_BODY, 0, sound, 1, ATTN_IDLE);
info = corpsehit->GetDefault();
@ -3131,18 +3131,18 @@ DEFINE_ACTION_FUNCTION(AActor, A_Pain)
FString pain_sound = pain_amount;
pain_sound += '-';
pain_sound += self->player->LastDamageType.GetChars();
sfx_id = pain_sound;
sfx_id = S_FindSound(pain_sound);
if (sfx_id == NO_SOUND)
{
// Try again without a specific pain amount.
pain_sound = "*pain-";
pain_sound += self->player->LastDamageType.GetChars();
sfx_id = pain_sound;
sfx_id = S_FindSound(pain_sound);
}
}
if (sfx_id == NO_SOUND)
{
sfx_id = pain_amount;
sfx_id = S_FindSound(pain_amount);
}
S_Sound (self, CHAN_VOICE, 0, sfx_id, 1, ATTN_NORM);