MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor calc_snd_position to take a Point instead of x/y params

Browse source 
Appears this function is only called internally despite being in the effects header.
This commit is contained in:
ephphatha 2021-06-06 23:10:07 +10:00 • committed by Anders Jenbo
commit 15c285c879
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/effects.cpp
View file

@ -1143,19 +1143,17 @@ void FreeMonsterSnd()
}
}
bool calc_snd_position(int x, int y, int *plVolume, int *plPan)
bool calc_snd_position(Point soundPosition, int *plVolume, int *plPan)
{
int pan, volume;
const auto &playerPosition = plr[myplr].position.tile;
const auto delta = soundPosition - playerPosition;
const int dx = x - playerPosition.x;
const int dy = y - playerPosition.y;
pan = (dx - dy) * 256;
pan = (delta.x - delta.y) * 256;
*plPan = clamp(pan, PAN_MIN, PAN_MAX);
volume = playerPosition.ApproxDistance({ x, y });
volume = playerPosition.ApproxDistance(soundPosition);
volume *= -64;
if (volume <= ATTENUATION_MIN)
@ -1183,7 +1181,7 @@ static void PlaySFX_priv(TSFX *pSFX, bool loc, int x, int y)
lPan = 0;
lVolume = 0;
if (loc && !calc_snd_position(x, y, &lVolume, &lPan)) {
if (loc && !calc_snd_position({ x, y }, &lVolume, &lPan)) {
return;
}
@ -1218,7 +1216,7 @@ void PlayEffect(int i, int mode)
return;
}
if (!calc_snd_position(monster[i].position.tile.x, monster[i].position.tile.y, &lVolume, &lPan))
if (!calc_snd_position(monster[i].position.tile, &lVolume, &lPan))
return;
snd_play_snd(snd, lVolume, lPan);