zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-04 23:12:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed: Resource IDs for sounds must be unique.

Browse source 
If an ID gets used it must be taken off any other sound that has it.
This commit is contained in:
Christoph Oelckers 2023-12-06 16:27:58 +01:00
parent 60d3a5e6b3
commit 8d4631eee9
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/core/music/s_advsound.cpp
View file

@ -461,9 +461,16 @@ static void S_AddSNDINFO (int lump)
// Assigns a resource ID to the given sound.
sc.MustGetString();
FSoundID sfx = soundEngine->FindSoundTentative(sc.String, DEFAULT_LIMIT);
auto sfxp = soundEngine->GetWritableSfx(sfx);
sc.MustGetNumber();
// remove resource ID from any previously defined sound.
for (unsigned i = 0; i < soundEngine->GetNumSounds(); i++)
{
auto sfxp = soundEngine->GetWritableSfx(FSoundID::fromInt(i));
if (sfxp->ResourceId == sc.Number) sfxp->ResourceId = -1;
}
auto sfxp = soundEngine->GetWritableSfx(sfx);
sfxp->ResourceId = sc.Number;
break;
}