zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Exhumed: Resolve sound issues following bad merge conflict resolve from b06a847d9a.

This commit is contained in:
Mitchell Richters 2020-10-11 22:01:27 +11:00
parent adaf25377c
commit 372f0db28a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/exhumed/src/sound.cpp
View File

@ -191,17 +191,22 @@ int LoadSound(const char* name)
auto lump = S_LookupSound(filename);
if (lump > 0)
{
auto &S_sfx = soundEngine->GetSounds();
S_sfx.Reserve(1);
int retval = S_sfx.Size() - 2;
auto check = fileSystem.GetFileData(lump);
bool loops = false;
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.
loops = true;
looped[retval] = true;
}
int retval = soundEngine->AddSoundLump(nname, lump, -1, 6);
soundEngine->CacheSound(retval);
looped[retval-1] = loops;
return retval - 1;
auto& newsfx = S_sfx.Last();
newsfx.name = nname;
newsfx.lumpnum = lump;
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
{