YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-02-01 09:44:21 +00:00
Code Issues Projects Releases Wiki Activity

engine: client: fix sound not spatialized correctly, remove unused field from rawchan

Browse Source
This commit is contained in:
Alibek Omarov 2021-06-07 02:21:46 +03:00
parent 0f84ce40f0
commit 60c10333aa
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engine/client/cl_frame.c
View File

@ -1378,17 +1378,13 @@ qboolean CL_GetEntitySpatialization( channel_t *ch )
ent = CL_GetEntityByIndex( ch->entnum ); ent = CL_GetEntityByIndex( ch->entnum );
// entity is not present on the client but has valid origin // entity is not present on the client but has valid origin
if( !ent || !ent->index || ent->curstate.messagenum == 0 ) if( !ent || !ent->model || ent->curstate.messagenum != cl.parsecount )
return valid_origin; return valid_origin;
#if 0 VectorCopy( ent->origin, ch->origin );
// uncomment this if you want enable additional check by PVS
if( ent->curstate.messagenum != cl.parsecount ) if( ent->model->type == mod_brush )
return valid_origin; VectorAverage( ent->curstate.mins, ent->curstate.maxs, ch->origin );
#endif
// setup origin
VectorAverage( ent->curstate.mins, ent->curstate.maxs, ch->origin );
VectorAdd( ch->origin, ent->curstate.origin, ch->origin );
return true; return true;
} }
@ -1406,12 +1402,10 @@ qboolean CL_GetMovieSpatialization( rawchan_t *ch )
return valid_origin; return valid_origin;
// setup origin // setup origin
VectorAverage( ent->curstate.mins, ent->curstate.maxs, ch->origin ); VectorCopy( ent->origin, ch->origin );
VectorAdd( ch->origin, ent->curstate.origin, ch->origin );
// setup radius if( ent->model->type == mod_brush )
if( ent->model != NULL && ent->model->radius ) ch->radius = ent->model->radius; VectorAverage( ent->curstate.mins, ent->curstate.maxs, ch->origin );
else ch->radius = RadiusFromBounds( ent->curstate.mins, ent->curstate.maxs );
return true; return true;
} }

1
engine/client/sound.h
View File

@ -138,7 +138,6 @@ typedef struct rawchan_s
int rightvol; // 0-255 right volume int rightvol; // 0-255 right volume
float dist_mult; // distance multiplier (attenuation/clipK) float dist_mult; // distance multiplier (attenuation/clipK)
vec3_t origin; // only use if fixed_origin is set vec3_t origin; // only use if fixed_origin is set
float radius; // radius of this sound effect
volatile uint s_rawend; volatile uint s_rawend;
wavdata_t sound_info; // advance play position wavdata_t sound_info; // advance play position
float oldtime; // catch time jumps float oldtime; // catch time jumps