From caf924c83b11c0ccfe08df26935c699423116924 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Tue, 26 Aug 2003 03:56:26 +0000
Subject: * Added a bunch of MOD_s * Fixed buildable outline bug * Scoreboard
 now longer shown on death * Buildable kills no longer subtract 1 from score

---
 src/cgame/cg_draw.c  |  2 +-
 src/cgame/cg_event.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

(limited to 'src/cgame')

diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index b9f227dd..ea74e49f 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -2768,7 +2768,7 @@ static qboolean CG_DrawScoreboard( )
     return qfalse;
   }
 
-  if( cg.showScores || cg.predictedPlayerState.pm_type == PM_DEAD ||
+  if( cg.showScores ||
       cg.predictedPlayerState.pm_type == PM_INTERMISSION )
   {
     fade = 1.0;
diff --git a/src/cgame/cg_event.c b/src/cgame/cg_event.c
index 02070fef..8f6f6b55 100644
--- a/src/cgame/cg_event.c
+++ b/src/cgame/cg_event.c
@@ -111,6 +111,12 @@ static void CG_Obituary( entityState_t *ent )
     case MOD_SLOWBLOB:
       message = "should have visited a medical station";
       break;
+    case MOD_POISON:
+      message = "should have remembered the antitox";
+      break;
+    case MOD_HYDRA_PCLOUD: //FIXME
+      message = "was gassed by a hydra";
+      break;
     default:
       message = NULL;
       break;
@@ -130,6 +136,15 @@ static void CG_Obituary( entityState_t *ent )
           message = "toasted himself";
         break;
         
+      case MOD_LCANNON_SPLASH:
+        if( gender == GENDER_FEMALE )
+          message = "irradiated herself";
+        else if( gender == GENDER_NEUTER )
+          message = "irradiated itself";
+        else
+          message = "irradiated himself";
+        break;
+        
       default:
         if( gender == GENDER_FEMALE )
           message = "killed herself";
@@ -166,6 +181,9 @@ static void CG_Obituary( entityState_t *ent )
   {
     switch( mod )
     {
+      case MOD_PAINSAW:
+        message = "was sawn by";
+        break;
       case MOD_BLASTER:
         message = "was blasted by";
         break;
@@ -197,9 +215,39 @@ static void CG_Obituary( entityState_t *ent )
         message = "was caught in the fallout of";
         message2 = "'s lucifer cannon";
         break;
+        
+      case MOD_ABUILDER_CLAW:
+        message = "should leave";
+        message2 = "'s buildings alone";
+        break;
       case MOD_VENOM:
-            message = "was biten by";
+        message = "was biten by";
+        break;
+      case MOD_HYDRA_CLAW:
+        message = "was swiped by";
+        message2 = "'s hydra";
+        break;
+      case MOD_DRAGOON_CLAW:
+        message = "was clawed by";
+        message2 = "'s dragoon";
+        break;
+      case MOD_DRAGOON_POUNCE:
+        message = "was pounced upon by";
+        message2 = "'s dragoon";
         break;
+      case MOD_CHIMERA_CLAW:
+        message = "was clawed by";
+        message2 = "'s chimera";
+        break;
+      case MOD_CHIMERA_ZAP:
+        message = "was zapped by";
+        message2 = "'s chimera";
+        break;
+      case MOD_BMOFO_CLAW:
+        message = "was mauled by";
+        message2 = "'s big mofo";
+        break;
+        
       case MOD_TELEFRAG:
         message = "tried to invade";
         message2 = "'s personal space";
-- 
cgit