diff --git a/reaction/cgame/cg_event.c b/reaction/cgame/cg_event.c index e12065bc..5083c627 100644 --- a/reaction/cgame/cg_event.c +++ b/reaction/cgame/cg_event.c @@ -1470,6 +1470,15 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) { cgs.media.footsteps[ FOOTSTEP_GRASS ][rand()&3] ); } break; + /* + case EV_FOOTSTEP_GRAVEL: + DEBUGNAME("EV_FOOTSTEP_GRAVEL"); + if (cg_footsteps.integer) { + trap_S_StartSound (NULL, es->number, CHAN_BODY, + cgs.media.footsteps[ FOOTSTEP_GRAVEL ][rand()&3] ); + } + break; + */ case EV_FOOTSTEP_WOOD: DEBUGNAME("EV_FOOTSTEP_WOOD"); if (cg_footsteps.integer) { diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h index f0b2c460..c9f64754 100644 --- a/reaction/cgame/cg_local.h +++ b/reaction/cgame/cg_local.h @@ -110,6 +110,7 @@ typedef enum { FOOTSTEP_WOOD, FOOTSTEP_CARPET, FOOTSTEP_METAL2, + //FOOTSTEP_GRAVEL, FOOTSTEP_TOTAL } footstep_t; diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c index 5014ba22..ba7aab99 100644 --- a/reaction/cgame/cg_main.c +++ b/reaction/cgame/cg_main.c @@ -669,7 +669,7 @@ static void CG_RegisterSounds( void ) { cgs.media.headshotSound = trap_S_RegisterSound( "sound/misc/headshot.wav", qfalse); //cgs.media.lcaSound = trap_S_RegisterSound( "sound/misc/lca.wav", qfalse); cgs.media.silencerSound = trap_S_RegisterSound( "sound/misc/silencershot.wav", qfalse); - cgs.media.kevlarHitSound = trap_S_RegisterSound( "sound/misc/vest.wav", qfalse); + cgs.media.kevlarHitSound = trap_S_RegisterSound( "sound/misc/kevlarhit.wav", qfalse); cgs.media.weapToggleSound = trap_S_RegisterSound( "sound/misc/click.wav", qfalse); cgs.media.knifeClankSound = trap_S_RegisterSound( "sound/misc/knife_clank.wav", qfalse); cgs.media.knifeDeathSound = trap_S_RegisterSound( "sound/player/gurp2.wav", qfalse); @@ -759,7 +759,7 @@ static void CG_RegisterSounds( void ) { cgs.media.footsteps[FOOTSTEP_METAL][i] = trap_S_RegisterSound (name, qfalse); //Elder: new footsteps - Com_sprintf (name, sizeof(name), "sound/player/footsteps/grass%i.wav", i+1); + Com_sprintf (name, sizeof(name), "sound/player/footsteps/gravel%i.wav", i+1); cgs.media.footsteps[FOOTSTEP_GRASS][i] = trap_S_RegisterSound (name, qfalse); Com_sprintf (name, sizeof(name), "sound/player/footsteps/wood%i.wav", i+1); @@ -770,6 +770,9 @@ static void CG_RegisterSounds( void ) { Com_sprintf (name, sizeof(name), "sound/player/footsteps/metal%i.wav", i+1); cgs.media.footsteps[FOOTSTEP_METAL2][i] = trap_S_RegisterSound (name, qfalse); + + //Com_sprintf (name, sizeof(name), "sound/player/footsteps/gravel%i.wav", i+1); + //cgs.media.footsteps[FOOTSTEP_GRAVEL][i] = trap_S_RegisterSound (name, qfalse); } // only register the items that the server says we need diff --git a/reaction/cgame/cg_weapons.c b/reaction/cgame/cg_weapons.c index b3940629..7298e4c6 100644 --- a/reaction/cgame/cg_weapons.c +++ b/reaction/cgame/cg_weapons.c @@ -3145,7 +3145,7 @@ void CG_MissileHitWall( int weapon, int clientNum, vec3_t origin, le->light = light; VectorCopy( lightColor, le->lightColor ); } - else + else if ( cg_RQ3_impactEffects.integer ) { vec3_t temp, offsetDir; byte color[4];