teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: handle pos in _PlaySound

Browse source
This commit is contained in:
Christoph Oelckers 2022-02-02 00:00:54 +01:00
parent b74355fcee
commit d35b131dd5
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/games/sw/src/sounds.cpp
View file

@ -627,12 +627,13 @@ void GameInterface::UpdateSounds(void)
// //
//========================================================================== //==========================================================================
int _PlaySound(int num, DSWActor* actor, PLAYER* pp, vec3_t* pos, int flags, int channel, EChanFlags cflags) int _PlaySound(int num, DSWActor* actor, PLAYER* pp, vec3_t* ppos, int flags, int channel, EChanFlags cflags)
{ {
if (Prediction || !SoundEnabled() || !soundEngine->isValidSoundId(num)) if (Prediction || !SoundEnabled() || !soundEngine->isValidSoundId(num))
return -1; return -1;
auto sps = actor; auto sps = actor;
auto pos = ppos ? *ppos : vec3_t(0, 0, 0);
auto vp = &voc[num]; auto vp = &voc[num];
int sourcetype = SOURCE_None; int sourcetype = SOURCE_None;
@ -641,19 +642,19 @@ int _PlaySound(int num, DSWActor* actor, PLAYER* pp, vec3_t* pos, int flags, int
// If the sound is not supposd to be positioned, it may not be linked to the launching actor. // If the sound is not supposd to be positioned, it may not be linked to the launching actor.
if (!(flags & v3df_follow)) if (!(flags & v3df_follow))
{ {
if (actor && !pos) if (actor && !ppos)
{ {
pos = &actor->spr.pos; pos = actor->spr.pos;
actor = nullptr; actor = nullptr;
} }
else if (pp && !pos) else if (pp && !ppos)
{ {
pos = &pp->pos; pos = pp->pos;
pp = nullptr; pp = nullptr;
} }
} }
if (pos != nullptr) if (ppos != nullptr)
{ {
sourcetype = SOURCE_Unattached; sourcetype = SOURCE_Unattached;
} }
@ -678,7 +679,7 @@ int _PlaySound(int num, DSWActor* actor, PLAYER* pp, vec3_t* pos, int flags, int
else if (vp->pitch_hi != vp->pitch_lo) pitch = vp->pitch_lo + (StdRandomRange(vp->pitch_hi - vp->pitch_lo)); else if (vp->pitch_hi != vp->pitch_lo) pitch = vp->pitch_lo + (StdRandomRange(vp->pitch_hi - vp->pitch_lo));
auto rolloff = GetRolloff(vp->voc_distance); auto rolloff = GetRolloff(vp->voc_distance);
FVector3 spos = pos ? GetSoundPos(pos) : FVector3(0, 0, 0); FVector3 spos = GetSoundPos(pos);
auto chan = soundEngine->StartSound(sourcetype, source, &spos, channel, cflags, num, 1.f, ATTN_NORM, &rolloff, S_ConvertPitch(pitch)); auto chan = soundEngine->StartSound(sourcetype, source, &spos, channel, cflags, num, 1.f, ATTN_NORM, &rolloff, S_ConvertPitch(pitch));
if (chan && sourcetype == SOURCE_Unattached) chan->Source = sps; // needed for sound termination. if (chan && sourcetype == SOURCE_Unattached) chan->Source = sps; // needed for sound termination.
return 1; return 1;