diff options
Diffstat (limited to 'src/cgame/cg_event.c')
-rw-r--r-- | src/cgame/cg_event.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c index f0b747b0..72e8ab21 100644 --- a/src/cgame/cg_event.c +++ b/src/cgame/cg_event.c @@ -924,19 +924,19 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) case EV_MISSILE_HIT: DEBUGNAME("EV_MISSILE_HIT"); ByteToDir( es->eventParm, dir ); - CG_MissileHitPlayer( es->weapon, position, dir, es->otherEntityNum ); + CG_MissileHitPlayer( es->weapon, position, dir, es->otherEntityNum, es->generic1 ); break; case EV_MISSILE_MISS: DEBUGNAME("EV_MISSILE_MISS"); ByteToDir( es->eventParm, dir ); - CG_MissileHitWall( es->weapon, 0, position, dir, IMPACTSOUND_DEFAULT ); + CG_MissileHitWall( es->weapon, 0, position, dir, IMPACTSOUND_DEFAULT, es->generic1 ); break; case EV_MISSILE_MISS_METAL: DEBUGNAME("EV_MISSILE_MISS_METAL"); ByteToDir( es->eventParm, dir ); - CG_MissileHitWall( es->weapon, 0, position, dir, IMPACTSOUND_METAL ); + CG_MissileHitWall( es->weapon, 0, position, dir, IMPACTSOUND_METAL, es->generic1 ); break; case EV_ITEM_EXPLOSION: @@ -963,7 +963,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) CG_TeslaTrail( es->origin2, es->pos.trBase ); if ( es->eventParm != 255 ) { ByteToDir( es->eventParm, dir ); - CG_MissileHitWall( es->weapon, es->clientNum, position, dir, IMPACTSOUND_DEFAULT ); + CG_MissileHitWall( es->weapon, es->clientNum, position, dir, IMPACTSOUND_DEFAULT, 0 ); } break; @@ -997,11 +997,11 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) else spark = cgs.media.gibSpark2; - velocity[ 0 ] = crandom( ) * MASS_EJECTION_VEL; - velocity[ 1 ] = crandom( ) * MASS_EJECTION_VEL; - velocity[ 2 ] = MASS_EJECTION_VEL + crandom( ) * MASS_EJECTION_VEL; + velocity[ 0 ] = ( 2 * random( ) - 1.0f ) * MASS_EJECTION_VEL; + velocity[ 1 ] = ( 2 * random( ) - 1.0f ) * MASS_EJECTION_VEL; + velocity[ 2 ] = ( 2 * random( ) - 1.0f ) * MASS_EJECTION_VEL; - CG_LaunchSprite( origin, velocity, accel, 0.6, 4.0f, 2.0f, 255, 0, rand( ) % 360, + CG_LaunchSprite( origin, velocity, accel, 0.999, 4.0f, 2.0f, 255, 0, rand( ) % 360, cg.time, 5000 + ( crandom( ) * 3000 ), spark, qfalse, qfalse ); } |