commit 316090de719311b74cb94ee925b99ab0a44c01b4
Author: devhc <devhc@.(none)>
Date:   Thu Jul 21 03:45:40 2011 +0200

    instead of removing the unused sfx handles, use them (as intended, as it seems!)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index fd59b8e..6f0a52f 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -840,9 +840,9 @@ typedef struct {
 	sfxHandle_t	sfx_nghit;
 	sfxHandle_t	sfx_nghitflesh;
 	sfxHandle_t	sfx_nghitmetal;
-	//sfxHandle_t	sfx_chghit;
-	//sfxHandle_t	sfx_chghitflesh;
-	//sfxHandle_t	sfx_chghitmetal;
+	sfxHandle_t	sfx_chghit;
+	sfxHandle_t	sfx_chghitflesh;
+	sfxHandle_t	sfx_chghitmetal;
 	sfxHandle_t kamikazeExplodeSound;
 	sfxHandle_t kamikazeImplodeSound;
 	sfxHandle_t kamikazeFarSound;
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index af6b998..0e40578 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -733,9 +733,9 @@ static void CG_RegisterSounds( void ) {
 	cgs.media.sfx_nghit = trap_S_RegisterSound( "sound/weapons/nailgun/wnalimpd.wav" , qfalse);
 	cgs.media.sfx_nghitflesh = trap_S_RegisterSound( "sound/weapons/nailgun/wnalimpl.wav" , qfalse);
 	cgs.media.sfx_nghitmetal = trap_S_RegisterSound( "sound/weapons/nailgun/wnalimpm.wav", qfalse );
-	//cgs.media.sfx_chghit = trap_S_RegisterSound( "sound/weapons/vulcan/wvulimpd.wav", qfalse );
-	//cgs.media.sfx_chghitflesh = trap_S_RegisterSound( "sound/weapons/vulcan/wvulimpl.wav", qfalse );
-	//cgs.media.sfx_chghitmetal = trap_S_RegisterSound( "sound/weapons/vulcan/wvulimpm.wav", qfalse );
+	cgs.media.sfx_chghit = trap_S_RegisterSound( "sound/weapons/vulcan/wvulimpd.wav", qfalse );
+	cgs.media.sfx_chghitflesh = trap_S_RegisterSound( "sound/weapons/vulcan/wvulimpl.wav", qfalse );
+	cgs.media.sfx_chghitmetal = trap_S_RegisterSound( "sound/weapons/vulcan/wvulimpm.wav", qfalse );
 	cgs.media.weaponHoverSound = trap_S_RegisterSound( "sound/weapons/weapon_hover.wav", qfalse );
 	cgs.media.kamikazeExplodeSound = trap_S_RegisterSound( "sound/items/kam_explode.wav", qfalse );
 	cgs.media.kamikazeImplodeSound = trap_S_RegisterSound( "sound/items/kam_implode.wav", qfalse );
diff --git a/code/cgame/cg_weapons.c b/code/cgame/cg_weapons.c
index 44a130b..f48dcb7 100644
--- a/code/cgame/cg_weapons.c
+++ b/code/cgame/cg_weapons.c
@@ -1873,23 +1873,14 @@ void CG_MissileHitWall( int weapon, int clientNum, vec3_t origin, vec3_t dir, im
 #ifdef MISSIONPACK
 	case WP_CHAINGUN:
 		mod = cgs.media.bulletFlashModel;
-		/*if( soundType == IMPACTSOUND_FLESH ) {
+		if( soundType == IMPACTSOUND_FLESH ) {
 			sfx = cgs.media.sfx_chghitflesh;
 		} else if( soundType == IMPACTSOUND_METAL ) {
 			sfx = cgs.media.sfx_chghitmetal;
 		} else {
 			sfx = cgs.media.sfx_chghit;
-		}*/
-		mark = cgs.media.bulletMarkShader;
-
-		r = rand() & 3;
-		if ( r < 2 ) {
-			sfx = cgs.media.sfx_ric1;
-		} else if ( r == 2 ) {
-			sfx = cgs.media.sfx_ric2;
-		} else {
-			sfx = cgs.media.sfx_ric3;
 		}
+		mark = cgs.media.bulletMarkShader;
 
 		radius = 8;
 		break;