FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix geiger sounds interrupting other sounds (#303)

This commit is contained in:
Roman Chistokhodov 2022-08-06 17:42:21 +03:00
parent 575096ac76
commit 230e9a886c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cl_dll/geiger.cpp
View File

@ -25,6 +25,7 @@
#include <stdio.h>
#include "parsemsg.h"
#include "event_api.h"
DECLARE_MESSAGE( m_Geiger, Geiger )
@ -175,7 +176,10 @@ int CHudGeiger::Draw( float flTime )
j += rand() & 1;
sprintf( sz, "player/geiger%d.wav", j + 1 );
PlaySound( sz, flvol );
vec3_t view_ofs;
cl_entity_t *pthisplayer = gEngfuncs.GetLocalPlayer();
gEngfuncs.pEventAPI->EV_LocalPlayerViewheight( view_ofs );
gEngfuncs.pEventAPI->EV_PlaySound( pthisplayer->index, pthisplayer->origin + view_ofs, CHAN_STATIC, sz, flvol, ATTN_NORM, 0, PITCH_NORM );
}
}

2
dlls/player.cpp
View File

@ -2333,7 +2333,7 @@ Things powered by the battery
// if in range of radiation source, ping geiger counter
#define GEIGERDELAY 0.25f
#define GEIGERDELAY 0.28f
void CBasePlayer::UpdateGeigerCounter( void )
{