zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Fully initialize the sfxinfo struct for newly added sounds

Browse source 
This was using its own incomplete code instead of calling AddSoundLump for it.
This commit is contained in:
Christoph Oelckers 2020-10-05 00:35:17 +02:00
parent 46a1fe3826
commit dd5c3eee91
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/exhumed/src/sound.cpp
View file

@ -191,23 +191,17 @@ int LoadSound(const char* name)
auto lump = S_LookupSound(filename); auto lump = S_LookupSound(filename);
if (lump > 0) if (lump > 0)
{ {
auto &S_sfx = soundEngine->GetSounds();
S_sfx.Reserve(1);
int retval = S_sfx.Size() - 2;
auto check = fileSystem.GetFileData(lump); auto check = fileSystem.GetFileData(lump);
bool loops = false;
if (check.Size() > 26 && check[26] == 6 && !memcmp("Creative Voice File", check.Data(), 19)) if (check.Size() > 26 && check[26] == 6 && !memcmp("Creative Voice File", check.Data(), 19))
{ {
// This game uses the actual loop point information in the sound data as its only means to check if a sound is looped. // This game uses the actual loop point information in the sound data as its only means to check if a sound is looped.
looped[retval] = true; loops = true;
} }
auto& newsfx = S_sfx.Last(); int retval = soundEngine->AddSoundLump(nname, lump, -1, 6);
newsfx.Clear(); soundEngine->CacheSound(retval);
newsfx.name = nname; looped[retval-1] = loops;
newsfx.lumpnum = lump; return retval - 1;
newsfx.NearLimit = 6;
newsfx.bTentative = false;
soundEngine->CacheSound(retval + 1);
return retval;
} }
else if (!ISDEMOVER) // demo tries to load sound files it doesn't have else if (!ISDEMOVER) // demo tries to load sound files it doesn't have
{ {