summaryrefslogtreecommitdiff
path: root/src/cgame/cg_event.c
diff options
context:
space:
mode:
authorPaweł Redman <pawel.redman@gmail.com>2015-06-26 15:26:38 +0200
committerPaweł Redman <pawel.redman@gmail.com>2015-06-26 15:35:42 +0200
commit79a5d1bb793b2b90e84bd5b2f4fa07d21bcc6e56 (patch)
tree76731e03127369b3d924a4f7394705e37b6fb7ba /src/cgame/cg_event.c
parent1d197378168a3cb9edbda57899976084a9121e7b (diff)
Bug fixes for Wraith.
Diffstat (limited to 'src/cgame/cg_event.c')
-rw-r--r--src/cgame/cg_event.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index c459f32..c6ecaad 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -1007,7 +1007,14 @@ void CG_EntityEvent( centity_t *cent, vec3_t position )
CG_AttachToPoint( &ps->attachment );
}
- trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.warpEnterSound );
+ if( clientNum == cg.predictedPlayerState.clientNum )
+ {
+ trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.warpEnterSound );
+ }
+ else
+ {
+ trap_S_StartSound( position, ENTITYNUM_WORLD, CHAN_AUTO, cgs.media.warpEnterSound );
+ }
CG_InduceViewQuake( cent->lerpOrigin, 15 );
}
@@ -1025,7 +1032,14 @@ void CG_EntityEvent( centity_t *cent, vec3_t position )
CG_AttachToPoint( &ps->attachment );
}
- trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.warpExitSound );
+ if( clientNum == cg.predictedPlayerState.clientNum )
+ {
+ trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.warpExitSound );
+ }
+ else
+ {
+ trap_S_StartSound( position, ENTITYNUM_WORLD, CHAN_AUTO, cgs.media.warpExitSound );
+ }
CG_InduceViewQuake( cent->lerpOrigin, 15 );
}