From 2f9f1045ac6e4c33ea86429fb69e3be351dfaee0 Mon Sep 17 00:00:00 2001
From: Ben Millwood <thebenmachine@gmail.com>
Date: Thu, 15 Apr 2010 22:51:12 +0000
Subject: * Restore the 'should have run further' message when target ==
 attacker

---
 src/cgame/cg_event.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/cgame')

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 )
     {
-- 
cgit