FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-12-29 12:15:26 +01:00
Code Issues 2 Projects Releases Wiki Activity

engine: client: call SND_ForceOpen/CloseMouth within SND_Open/CloseMouth to avoid copypasted code

Browse Source
This commit is contained in:
Alibek Omarov 2023-01-27 05:51:43 +03:00
parent 801dbaa387
commit 327372e253
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
engine/client/s_mouth.c
View File

@ -24,17 +24,7 @@ void SND_InitMouth( int entnum, int entchannel )
{
if(( entchannel == CHAN_VOICE || entchannel == CHAN_STREAM ) && entnum > 0 )
{
cl_entity_t *clientEntity;
// init mouth movement vars
clientEntity = CL_GetEntityByIndex( entnum );
if( clientEntity )
{
clientEntity->mouth.mouthopen = 0;
clientEntity->mouth.sndcount = 0;
clientEntity->mouth.sndavg = 0;
}
SND_ForceInitMouth( entnum );
}
}
@ -42,15 +32,7 @@ void SND_CloseMouth( channel_t *ch )
{
if( ch->entchannel == CHAN_VOICE || ch->entchannel == CHAN_STREAM )
{
cl_entity_t *clientEntity;
clientEntity = CL_GetEntityByIndex( ch->entnum );
if( clientEntity )
{
// shut mouth
clientEntity->mouth.mouthopen = 0;
}
SND_ForceCloseMouth( ch->entnum );
}
}
@ -157,7 +139,7 @@ void SND_ForceInitMouth( int entnum )
clientEntity = CL_GetEntityByIndex( entnum );
if ( clientEntity )
if( clientEntity )
{
clientEntity->mouth.mouthopen = 0;
clientEntity->mouth.sndavg = 0;
@ -171,7 +153,7 @@ void SND_ForceCloseMouth( int entnum )
clientEntity = CL_GetEntityByIndex( entnum );
if ( clientEntity )
if( clientEntity )
clientEntity->mouth.mouthopen = 0;
}
@ -214,4 +196,4 @@ void SND_MoveMouthRaw( rawchan_t *ch, portable_samplepair_t *pData, int count )
pMouth->sndavg = 0;
pMouth->sndcount = 0;
}
}
}