Skip to content

Commit

Permalink
engine: server: fix sound not being overriden when an entity sound ca…
Browse files Browse the repository at this point in the history
…me from has an aiment set

This check was added 10+ years ago in 8f6f3fc (viewable in Xash3DArchive) and
probably doesn't make any sense anymore.
  • Loading branch information
a1batross committed Jul 6, 2024
1 parent eff86de commit 080eba9
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions engine/server/sv_game.c
Original file line number Diff line number Diff line change
Expand Up @@ -2055,9 +2055,7 @@ int SV_BuildSoundMsg( sizebuf_t *msg, edict_t *ent, int chan, const char *sample

spawn = FBitSet( flags, SND_RESTORE_POSITION ) ? false : true;

if( SV_IsValidEdict( ent ) && SV_IsValidEdict( ent->v.aiment ))
entityIndex = NUM_FOR_EDICT( ent->v.aiment );
else if( SV_IsValidEdict( ent ))
if( SV_IsValidEdict( ent ))

This comment has been minimized.

Copy link
@a1batross

a1batross Jul 6, 2024

Author Member

Relevant issue: #1196

entityIndex = NUM_FOR_EDICT( ent );
else entityIndex = 0; // assume world

Expand Down

0 comments on commit 080eba9

Please sign in to comment.