From d6fa5c74ba80688a3e14d2e099bfb6077323d079 Mon Sep 17 00:00:00 2001 From: Paweł Redman Date: Sat, 4 Apr 2015 19:19:17 +0200 Subject: Initial implementation of hit sounds. --- src/cgame/cg_main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/cgame/cg_main.c') diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 9e51258..06fd2a3 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -238,6 +238,8 @@ vmCvar_t cg_damageBlobAlpha; vmCvar_t cg_healthBarSize; vmCvar_t cg_healthBarAlpha; +vmCvar_t cg_hitSounds; + typedef struct { vmCvar_t *vmCvar; @@ -391,7 +393,9 @@ static cvarTable_t cvarTable[ ] = { &cg_damageBlobAlpha, "cg_damageBlobAlpha", "0.8", CVAR_ARCHIVE }, { &cg_healthBarSize, "cg_healthBarSize", "2000", CVAR_ARCHIVE }, - { &cg_healthBarAlpha, "cg_healthBarAlpha", "0.5", CVAR_ARCHIVE } + { &cg_healthBarAlpha, "cg_healthBarAlpha", "0.5", CVAR_ARCHIVE }, + + { &cg_hitSounds, "cg_hitSounds", "1", CVAR_ARCHIVE } }; static int cvarTableSize = sizeof( cvarTable ) / sizeof( cvarTable[0] ); @@ -647,7 +651,14 @@ static void CG_RegisterSounds( void ) int i; char name[ MAX_QPATH ]; const char *soundName; - + const char *hit_sounds[ 5 ] = + { + "sound/feedback/hit_enemy.wav", + "sound/feedback/hit_splash.wav", + "sound/feedback/hit_building.wav", + "sound/feedback/hit_building_splash.wav", + "sound/feedback/hit_friendly.wav", + }; cgs.media.alienStageTransition = trap_S_RegisterSound( "sound/announcements/overmindevolved.wav", qtrue ); @@ -751,6 +762,9 @@ static void CG_RegisterSounds( void ) cgs.media.FlamerWarningSound = trap_S_RegisterSound( "models/weapons/flamer/warning.wav", qfalse ); cgs.media.FlamerWarningSound2 = trap_S_RegisterSound( "models/weapons/flamer/warning2.wav", qfalse ); + + for( i = 0; i < 5; i++ ) + cgs.media.hitSounds[ i ] = trap_S_RegisterSound( hit_sounds[ i ], qfalse ); } -- cgit