summaryrefslogtreecommitdiff
path: root/src/cgame/cg_event.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/cgame/cg_event.c')
-rw-r--r--src/cgame/cg_event.c40
1 files changed, 1 insertions, 39 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 );