teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-14 16:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: account for invalid player actors being passed to the sound engine.

Browse source
This commit is contained in:
Christoph Oelckers 2023-01-08 12:40:32 +01:00
parent 1f489d5dbe
commit 7262184d53
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -529,7 +529,16 @@ void SWSoundEngine::CalcPosVel(int type, const void* source, const float pt[3],
} }
else if (type == SOURCE_Actor || type == SOURCE_Player) else if (type == SOURCE_Actor || type == SOURCE_Player)
{ {
vPos = type == SOURCE_Actor ? ((DSWActor*)source)->spr.pos : ((PLAYER*)source)->actor->getPosWithOffsetZ(); if (type == SOURCE_Actor)
{
vPos = ((DSWActor*)source)->spr.pos;
}
else
{
auto act = ((PLAYER*)source)->actor;
if (act) vPos = act->getPosWithOffsetZ();
else vPos = pp->actor->getPosWithOffsetZ();
}
pancheck = true; pancheck = true;
FVector3 npos = GetSoundPos(vPos); FVector3 npos = GetSoundPos(vPos);