diff options
| author | Tim Angus <tim@ngus.net> | 2002-03-29 17:31:08 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2002-03-29 17:31:08 +0000 |
| commit | 944a6bd6d99e66bb0d4cc3b5d53ff7322c7e6837 (patch) | |
| tree | 445cdebe5e5833ad2d168ab3468bca3044aa057b | |
| parent | 2b71d33a0d2961e93ff0a92692e5c4b7f57810d9 (diff) | |
Bugfix to radix sort. Flamer sounds
| -rw-r--r-- | src/cgame/cg_local.h | 1 | ||||
| -rw-r--r-- | src/cgame/cg_main.c | 1 | ||||
| -rw-r--r-- | src/cgame/cg_weapons.c | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h index 9504a0a4..c5bfc6bd 100644 --- a/src/cgame/cg_local.h +++ b/src/cgame/cg_local.h @@ -915,6 +915,7 @@ typedef struct { sfxHandle_t sfx_railg; sfxHandle_t sfx_rockexp; sfxHandle_t sfx_plasmaexp; + sfxHandle_t sfx_flamerexp; sfxHandle_t gibSound; sfxHandle_t gibBounce1Sound; sfxHandle_t gibBounce2Sound; diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 4f5da5a8..5463ad20 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -631,6 +631,7 @@ static void CG_RegisterSounds( void ) { cgs.media.sfx_railg = trap_S_RegisterSound ("sound/weapons/railgun/railgf1a.wav", qfalse); cgs.media.sfx_rockexp = trap_S_RegisterSound ("sound/weapons/rocket/rocklx1a.wav", qfalse); cgs.media.sfx_plasmaexp = trap_S_RegisterSound ("sound/weapons/plasma/plasmx1a.wav", qfalse); + cgs.media.sfx_flamerexp = trap_S_RegisterSound ("sound/weapons/flamer/fireimpc.wav", qfalse); cgs.media.regenSound = trap_S_RegisterSound("sound/items/regen.wav", qfalse); cgs.media.protectSound = trap_S_RegisterSound("sound/items/protect3.wav", qfalse); diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index 2f00e432..55c0ff73 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -704,7 +704,7 @@ void CG_RegisterWeapon( int weaponNum ) break; case WP_FLAMER: - weaponInfo->missileSound = trap_S_RegisterSound( "sound/weapons/plasma/lasfly.wav", qfalse ); + weaponInfo->missileSound = trap_S_RegisterSound( "sound/weapons/flamer/fireloop.wav", qfalse ); MAKERGB( weaponInfo->flashDlightColor, 0.25, 0.1, 0 ); //weaponInfo->flashSound[0] = trap_S_RegisterSound( "sound/weapons/railgun/railgf1a.wav", qfalse ); /*cgs.media.flameExplShader = trap_R_RegisterShader( "rocketExplosion" );*/ @@ -1812,7 +1812,7 @@ void CG_MissileHitWall( int weapon, int clientNum, vec3_t origin, vec3_t dir, im isSprite = qtrue; break; case WP_FLAMER: - sfx = cgs.media.sfx_plasmaexp; + sfx = cgs.media.sfx_flamerexp; mark = cgs.media.burnMarkShader; radius = 32; break; |