zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-19 08:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed handling of DSDHacked sound replacement in the index range between the regular sounds and the MBF21 extensions.

Browse source
This commit is contained in:
Christoph Oelckers 2023-10-28 09:20:56 +02:00
parent 4d88e82e32
commit 478a832515
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gamedata/d_dehacked.cpp
View file

@ -152,9 +152,12 @@ static PClassActor* FindInfoName(int index, bool mustexist = false)
static FSoundID DehFindSound(int index,bool mustexist = false)
{
if (index < 0) return NO_SOUND;
if (index < (int) SoundMap.Size()) return SoundMap[index];
FStringf name("~dsdhacked/#%d", index);
if (dsdhacked && !mustexist) return soundEngine->FindSoundTentative(name.GetChars());
if (index < (int) SoundMap.Size() && SoundMap[index].isvalid()) return SoundMap[index];
if (dsdhacked && !mustexist)
{
FStringf name("~dsdhacked/#%d", index);
return soundEngine->FindSoundTentative(name.GetChars());
}
return NO_SOUND;
}
@ -1476,7 +1479,7 @@ static int PatchThing (int thingy)
}
else if (stricmp (Line1 + linelen - 6, " sound") == 0)
{
FSoundID snd = DehFindSound(val - 1);
FSoundID snd = DehFindSound(val - 1, false);
if (snd == NO_SOUND) // This won't trigger for dsdhacked patches!
{