summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Millwood <thebenmachine@gmail.com>2010-04-15 22:51:12 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:17:35 +0000
commit2f9f1045ac6e4c33ea86429fb69e3be351dfaee0 (patch)
tree9edd516485d7fc08a808fd8b843a30d25e312f1e
parentbd8cbb10216e31fbb76154485877b7edf35782cf (diff)
* Restore the 'should have run further' message when target == attacker
-rw-r--r--src/cgame/cg_event.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 49e8128d..b87cb2d8 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -81,14 +81,6 @@ static void CG_Obituary( entityState_t *ent )
switch( mod )
{
- case MOD_SUICIDE:
- if( gender == GENDER_FEMALE )
- message = "killed herself";
- else if( gender == GENDER_NEUTER )
- message = "killed itself";
- else
- message = "killed himself";
- break;
case MOD_FALLING:
message = "fell fowl to gravity";
break;
@@ -142,7 +134,7 @@ static void CG_Obituary( entityState_t *ent )
break;
}
- if( attacker == target )
+ if( !message && attacker == target )
{
switch( mod )
{