zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-17 17:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: portal-related sound calculations offset the sound in the wrong direction.

Browse source
This commit is contained in:
Christoph Oelckers 2016-06-01 11:14:25 +02:00
parent 14e4a64c82
commit 978e522fb4
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/s_sound.cpp
View file

@ -684,9 +684,9 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector,
{ {
sector_t *sec = P_PointInSector(pt[0], pt[2]); sector_t *sec = P_PointInSector(pt[0], pt[2]);
DVector2 disp = Displacements.getOffset(pgroup, sec->PortalGroup); DVector2 disp = Displacements.getOffset(pgroup, sec->PortalGroup);
pos->X = pt[0] + (float)disp.X; pos->X = pt[0] - (float)disp.X;
pos->Y = !(chanflags & CHAN_LISTENERZ) ? pt[1] : (float)listenpos.Z; pos->Y = !(chanflags & CHAN_LISTENERZ) ? pt[1] : (float)listenpos.Z;
pos->Z = pt[2] + (float)disp.Y; pos->Z = pt[2] - (float)disp.Y;
} }
else else
{ {
@ -701,7 +701,7 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector,
if (actor != NULL) if (actor != NULL)
{ {
DVector2 disp = Displacements.getOffset(pgroup, actor->Sector->PortalGroup); DVector2 disp = Displacements.getOffset(pgroup, actor->Sector->PortalGroup);
DVector3 posi = actor->Pos() + disp; DVector3 posi = actor->Pos() - disp;
*pos = { (float)posi.X, (float)posi.Z, (float)posi.Y }; *pos = { (float)posi.X, (float)posi.Z, (float)posi.Y };
} }
break; break;
@ -714,15 +714,15 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector,
if (chanflags & CHAN_AREA) if (chanflags & CHAN_AREA)
{ {
// listener must be reversely offset to calculate the proper sound origin. // listener must be reversely offset to calculate the proper sound origin.
CalcSectorSoundOrg(listenpos-disp, sector, channum, *pos); CalcSectorSoundOrg(listenpos + disp, sector, channum, *pos);
pos->X += (float)disp.X; pos->X += (float)disp.X;
pos->Z += (float)disp.Y; pos->Z += (float)disp.Y;
} }
else else
{ {
pos->X = (float)(sector->centerspot.X + disp.X); pos->X = (float)(sector->centerspot.X - disp.X);
pos->Z = (float)(sector->centerspot.Y + disp.Y); pos->Z = (float)(sector->centerspot.Y - disp.Y);
chanflags |= CHAN_LISTENERZ; chanflags |= CHAN_LISTENERZ;
} }
} }
@ -733,7 +733,7 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector,
if (poly != NULL) if (poly != NULL)
{ {
DVector2 disp = Displacements.getOffset(pgroup, poly->CenterSubsector->sector->PortalGroup); DVector2 disp = Displacements.getOffset(pgroup, poly->CenterSubsector->sector->PortalGroup);
CalcPolyobjSoundOrg(listenpos-disp, poly, *pos); CalcPolyobjSoundOrg(listenpos + disp, poly, *pos);
pos->X += (float)disp.X; pos->X += (float)disp.X;
pos->Z += (float)disp.Y; pos->Z += (float)disp.Y;
} }