zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 06:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Avoid masking bits into the sector index as well.

Browse source 
# Conflicts:
#	source/games/exhumed/src/player.cpp
This commit is contained in:
Christoph Oelckers 2021-09-07 21:33:15 +02:00
parent 9991e6665c
commit d466ea155f
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/exhumed/src/player.cpp
View file

@ -1051,7 +1051,7 @@ void FuncPlayer(int a, int nDamage, int nRun)
sprite[nPlayerSprite].yvel = 0;
StopSpriteSound(nPlayerSprite);
PlayFXAtXYZ(StaticSound[kSoundJonFDie], sprite[nPlayerSprite].x, sprite[nPlayerSprite].y, sprite[nPlayerSprite].z, sprite[nPlayerSprite].sectnum |= 0x4000); // CHECKME
PlayFXAtXYZ(StaticSound[kSoundJonFDie], sprite[nPlayerSprite].x, sprite[nPlayerSprite].y, sprite[nPlayerSprite].z, sprite[nPlayerSprite].sectnum, CHANF_NONE, 1); // CHECKME
}
else
{

6
source/games/exhumed/src/sound.cpp
View file

@ -658,13 +658,13 @@ void PlayFX2(unsigned short nSound, short nSprite, int sectf, EChanFlags chanfla
//
//==========================================================================
void PlayFXAtXYZ(unsigned short ax, int x, int y, int z, int nSector, EChanFlags chanflags)
void PlayFXAtXYZ(unsigned short ax, int x, int y, int z, int nSector, EChanFlags chanflags, int sectf)
{
soundx = x;
soundy = y;
soundz = z;
soundsect = nSector&0x3fff;
PlayFX2(ax, -1, nSector & 0x4000, chanflags);
soundsect = nSector;
PlayFX2(ax, -1, sectf, chanflags);
}
//==========================================================================

2
source/games/exhumed/src/sound.h
View file

@ -132,7 +132,7 @@ void BendAmbientSound();
void CheckAmbience(short nSector);
void PlayFX2(unsigned short nSound, short nSprite, int sectf = 0, EChanFlags chanflags = CHANF_NONE, int sprflags = 0);
void PlayFXAtXYZ(unsigned short nSound, int x, int y, int z, int nSector, EChanFlags chanflags = CHANF_NONE);
void PlayFXAtXYZ(unsigned short nSound, int x, int y, int z, int nSector, EChanFlags chanflags = CHANF_NONE, int sectf = 0);
inline void D3PlayFX(unsigned short nSound, short nVal, short flags = 0)
{
PlayFX2(nSound, nVal, 0, CHANF_NONE, flags);