zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-19 07:01:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Blood: fixed incorrect defaults for relative sound volume in two places

Browse source
This commit is contained in:
Christoph Oelckers 2023-01-18 06:57:12 +01:00
parent f77db60d39
commit f6ff02c51e
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/blood/src/seq.cpp
View file

@ -386,7 +386,7 @@ void SEQINST::Update()
if (snd.isvalid())
{
auto udata = soundEngine->GetUserData(snd);
int relVol = udata ? udata[0] : 255;
int relVol = udata ? udata[0] : 80;
sfxPlay3DSoundCP(actor, sndId, -1, 0, 0, (surfSfxMove[surf][2] != relVol) ? relVol : surfSfxMove[surf][3]);
}
}

14
source/games/blood/src/sound.cpp
View file

@ -75,11 +75,6 @@ static void S_AddBloodSFX(int lumpnum)
if (sfxnum.isvalid())
{
soundfx = soundEngine->GetWritableSfx(sfxnum);
if (soundfx->UserData.Size() == 0)
{
soundfx->UserData.Resize(1);
soundfx->UserData[1] = 80; // default for RelVol
}
if (!soundfx->bTentative) return; // sound was already defined.
}
@ -120,8 +115,11 @@ static void S_AddBloodSFX(int lumpnum)
// pitchrange is unused.
if (sfx->pitch != 0x10000) soundfx->DefPitch = sfx->pitch / 65536.f;
else soundfx->DefPitch = 0;
int* udata = (int*)soundfx->UserData.Data();
udata[0] = sfx->relVol;
if (sfx->relVol != 80) // 80 is the default
{
soundfx->UserData.Resize(1);
soundfx->UserData[0] = sfx->relVol;
}
}
}
@ -214,7 +212,7 @@ void sndStartSample(unsigned int nSound, int nVolume, int nChannel, bool bLoop,
if (nVolume < 0)
{
auto udata = soundEngine->GetUserData(snd);
if (udata) nVolume = min(Scale(udata[0], 255, 100), 255);
if (udata) nVolume = min(Scale(udata[0], 255, 80), 255);
else nVolume = 255;
}
if (bLoop) chanflags |= CHANF_LOOP;