From b8820227eddf645da7df514ee2ecb46da6b30fc5 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 7 May 2006 06:35:35 +0000
Subject: [PATCH] Death message revisions and a dirty hack to make the player
 name display work with the HoloDuke

git-svn-id: https://svn.eduke32.com/eduke32@156 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/game.c    | 12 +++++++++++-
 polymer/eduke32/source/gamedef.c | 16 ++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 1d77c2c42..f85b087ee 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -3001,16 +3001,26 @@ void displayrest(long smoothratio)
         long sx,sy,sz;
         short sect,hw,hs;
 
+        for(i=0;i<MAXPLAYERS;i++)
+            if(ps[i].holoduke_on != -1)
+                sprite[ps[i].holoduke_on].cstat ^= 256;
+
         hitscan(ps[screenpeek].posx,ps[screenpeek].posy,ps[screenpeek].posz,ps[screenpeek].cursectnum,
                 sintable[(ps[screenpeek].ang+512)&2047],
                 sintable[ps[screenpeek].ang&2047],
                 (100-ps[screenpeek].horiz-ps[screenpeek].horizoff)<<11,&sect,&hw,&hs,&sx,&sy,&sz,0xffff0030);
 
+        for(i=0;i<MAXPLAYERS;i++)
+            if(ps[i].holoduke_on != -1)
+                sprite[ps[i].holoduke_on].cstat ^= 256;
+
+        initprintf("%d\n",sprite[hs].picnum);
+
         if(sprite[hs].picnum == APLAYER && sprite[hs].yvel != screenpeek)
         {
             if(ps[screenpeek].fta == 0 || ps[screenpeek].ftq == 117)
             {
-                if(ldist(&sprite[ps[screenpeek].i],&sprite[hs]) < 12288)
+                if(ldist(&sprite[ps[screenpeek].i],&sprite[hs]) < 9216)
                 {
                     Bsprintf(fta_quotes[117],"%s",&ud.user_name[sprite[hs].yvel][0]);
                     ps[screenpeek].fta = 12;
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index 9d5c5c92c..e7f8090c3 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -5839,7 +5839,7 @@ void loadefs(char *filenam)
                                          "%^2%s DANCED THE CHAINGUN CHA-CHA WITH %s",
                                          "%^2%s TRIED TO MAKE A BONG OUT OF %s'S ROCKET",
                                          "%^2%s EXPLODED.  BLAME %s!",
-                                         "%^2%s FELT THE EFFECTS OF %s'S CORPORATE DOWNSIZING",
+                                         "%^2%s BECAME ONE WITH THE GUM ON %s'S SHOE",
                                          "%^2%s WAS TOO COOL FOR %s",
                                          "%^2%s EXPANDED HIS HORIZONS WITH HELP FROM %s",
                                          "%^2%s THINKS %s SHOULD CHECK HIS GLASSES",
@@ -5850,18 +5850,18 @@ void loadefs(char *filenam)
                                          "%^2%s COULDN'T DANCE FAST ENOUGH FOR %s",
                                          "%^2%s TRIED TO OUTRUN %s'S ROCKET",
                                          "%^2%s FINALLY FOUND %s'S HIDDEN WMDS",
-                                         "%^2%s SHOULDN'T HAVE DELETED ALL THE VIAGRA SPAM FROM %s",
-                                         "%^2%s HAD TO SIT AND LISTEN TO %s QUOTE TERMINATOR 2 AGAIN",
+                                         "%^2%s WAS JUST TRYING TO HELP %s TIE HIS SHOELACES",
+                                         "%^2%s's IGLOO WAS WRECKED BY %s",
                                          "%^2%s BECAME A STICKY FILM ON %s'S BOOTS",
                                          "%^2%s WISHES %s HAD PRACTICED BEFORE PLAYING",
 
                                          "%^2%s WAS WALKED ALL OVER BY %s",
                                          "%^2%s WAS PICKED OFF BY %s",
-                                         "%^2%s MASQUERADED AS QUAIL FOR VICE PRESIDENT %s",
-                                         "%^2%s HELPED %s RE-ENACT SCARFACE",
-                                         "%^2%s BECAME THE SALSA FOR %s'S CHIPS",
-                                         "%^2%s WONDERS WHY %s HATES FREEDOM",
-                                         "%^2%s'S HEIGHT DROPPED FASTER THAN %s'S ENRON STOCK",
+                                         "%^2%s WENT QUAIL HUNTING WITH VICE PRESIDENT %s",
+                                         "%^2%s ENDED UP WITH A FEW NEW HOLES FROM %s's CHAINGUN",
+                                         "%^2%s WAS TURNED INTO %s BRAND CHUNKY SALSA",
+                                         "%^2%s FOUND A PRESENT FROM %s",
+                                         "%^2%s WAS SCATHED BY %s'S SHRINK RAY",
                                          "%^2%s WENT TO PIECES.  %s, HOW COULD YOU?",
                                          "%^2%s EXPANDED HIS HORIZONS WITH HELP FROM %s",
                                          "%^2%s WANTS TO KNOW WHY %s IS EVEN PLAYING COOP",