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

- fixed SW: DoPlayerFall should only stop the scream sound, but nothing else.

Browse source
This commit is contained in:
Christoph Oelckers 2020-03-01 09:59:52 +01:00
parent d6b17c0406
commit 809d2fc555
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/sw/src/game.h
View file

@ -2114,7 +2114,7 @@ inline void PlaySound(int num, vec3_t *pos, Voc3D_Flags flags, int channel = 8,
int _PlayerSound(int num, PLAYERp pp); int _PlayerSound(int num, PLAYERp pp);
inline int PlayerSound(int num, int flags, PLAYERp pp) { return _PlayerSound(num, pp); } inline int PlayerSound(int num, int flags, PLAYERp pp) { return _PlayerSound(num, pp); }
void StopPlayerSound(PLAYERp pp); void StopPlayerSound(PLAYERp pp, int which = -1);
bool SoundValidAndActive(SPRITEp spr, int channel); bool SoundValidAndActive(SPRITEp spr, int channel);

2
source/sw/src/player.cpp
View file

@ -3728,7 +3728,7 @@ DoPlayerFall(PLAYERp pp)
PlaySound(DIGI_HITGROUND, pp, v3df_follow|v3df_dontpan); PlaySound(DIGI_HITGROUND, pp, v3df_follow|v3df_dontpan);
} }
StopPlayerSound(pp); StopPlayerSound(pp, DIGI_FALLSCREAM);
// i any kind of crawl key get rid of recoil // i any kind of crawl key get rid of recoil
if (DoPlayerTestCrawl(pp) || TEST_SYNC_KEY(pp, SK_CRAWL)) if (DoPlayerTestCrawl(pp) || TEST_SYNC_KEY(pp, SK_CRAWL))

4
source/sw/src/sounds.cpp
View file

@ -824,9 +824,9 @@ int _PlayerSound(int num, PLAYERp pp)
return 0; return 0;
} }
void StopPlayerSound(PLAYERp pp) void StopPlayerSound(PLAYERp pp, int which)
{ {
soundEngine->StopSound(SOURCE_Player, pp, CHAN_VOICE); soundEngine->StopSound(SOURCE_Player, pp, CHAN_VOICE, which);
} }
bool SoundValidAndActive(SPRITEp spr, int channel) bool SoundValidAndActive(SPRITEp spr, int channel)