diff options
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_event.c | 40 | ||||
| -rw-r--r-- | src/cgame/cg_local.h | 1 | ||||
| -rw-r--r-- | src/cgame/cg_main.c | 4 | ||||
| -rw-r--r-- | src/cgame/cg_weapons.c | 2 |
4 files changed, 2 insertions, 45 deletions
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c index c6ecaad..eaf925e 100644 --- a/src/cgame/cg_event.c +++ b/src/cgame/cg_event.c @@ -148,7 +148,6 @@ static void CG_Obituary( entityState_t *ent ) switch( mod ) { case MOD_FLAMER_SPLASH: - case MOD_LEVEL4_FLAMES: if( gender == GENDER_FEMALE ) message = "^5toasted herself"; else if( gender == GENDER_NEUTER ) @@ -220,7 +219,7 @@ static void CG_Obituary( entityState_t *ent ) else message = "^5spiked himself"; break; - + case MOD_PRIFLE: if( gender == GENDER_FEMALE ) message = "^5pulse rifled herself"; @@ -229,25 +228,6 @@ static void CG_Obituary( entityState_t *ent ) else message = "^5pulse rifled himself"; break; - - - case MOD_MINE: - if( gender == GENDER_FEMALE ) - message = "^5was betrayed by own mine"; - else if( gender == GENDER_NEUTER ) - message = "^5it betrayed by own mine"; - else - message = "^5was betrayed by own mine"; - break; - - case MOD_FLAMES: - if( gender == GENDER_FEMALE ) - message = "^5was terminated by own flames"; - else if( gender == GENDER_NEUTER ) - message = "^5it terminated by own flames"; - else - message = "^5was terminated by own flames"; - break; default: if( gender == GENDER_FEMALE ) @@ -346,16 +326,6 @@ static void CG_Obituary( entityState_t *ent ) message = "^5was sliced by^7"; message2 = "^5's ^5blades"; break; - case MOD_MINE: - message = "^5found^7"; - message2 = "^5's ^5mine"; - break; - - case MOD_FLAMES: - case MOD_LEVEL4_FLAMES: - message = "^5tasted^7"; - message2 = "^5's ^5flames"; - break; case MOD_ABUILDER_CLAW: message = "^5should leave^7"; @@ -976,14 +946,6 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.hardBounceSound2 ); break; - case EV_MINE_BOUNCE: - if( rand( ) & 1 ) - trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.mineBounceSound1 ); - else - trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.mineBounceSound1 ); - break; - break; - case EV_ACIDBOMB_BOUNCE: if( rand( ) & 1 ) trap_S_StartSound( NULL, es->number, CHAN_AUTO, cgs.media.acidBombBounceSound1 ); diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h index 27e9baf..4642f64 100644 --- a/src/cgame/cg_local.h +++ b/src/cgame/cg_local.h @@ -1232,7 +1232,6 @@ typedef struct sfxHandle_t turretSpinupSound; sfxHandle_t hardBounceSound1; sfxHandle_t hardBounceSound2; - sfxHandle_t mineBounceSound1; sfxHandle_t airpounce; sfxHandle_t acidBombBounceSound1; diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index e17965c..158c0b5 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -752,9 +752,7 @@ static void CG_RegisterSounds( void ) cgs.media.hardBounceSound1 = trap_S_RegisterSound( "sound/misc/hard_bounce1.wav", qfalse ); cgs.media.hardBounceSound2 = trap_S_RegisterSound( "sound/misc/hard_bounce2.wav", qfalse ); - - cgs.media.mineBounceSound1 = trap_S_RegisterSound( "sound/misc/mine_bounce1.wav", qfalse ); - + cgs.media.airpounce = trap_S_RegisterSound( "models/weapons/level5/airpounce.wav", qfalse ); cgs.media.acidBombBounceSound1 = trap_S_RegisterSound( "sound/misc/abomb_bounce1.wav", qfalse ); diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index 12c2d21..4f2ef13 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -63,8 +63,6 @@ void CG_RegisterUpgrade( int upgradeNum ) //la la la la la, i'm not listening! if( upgradeNum == UP_GRENADE ) upgradeInfo->upgradeIcon = cg_weapons[ WP_GRENADE ].weaponIcon; - else if( upgradeNum == UP_MINE ) - upgradeInfo->upgradeIcon = cg_weapons[ WP_MINE ].weaponIcon; else if( ( icon = BG_Upgrade( upgradeNum )->icon ) ) upgradeInfo->upgradeIcon = trap_R_RegisterShader( icon ); } |