From ee236f29242c8463daf85b155338eef12bf222b4 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Fri, 24 Oct 2014 00:52:53 -0500
Subject: Upstream fix 2

Incorrect field being used to retrieve player names during deathmatch
for "%s killed %s" msg; changed to match disassembly.
---
 src/strife/p_inter.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c
index 857f4e13..71db6fe1 100644
--- a/src/strife/p_inter.c
+++ b/src/strife/p_inter.c
@@ -781,10 +781,11 @@ void P_KillMobj(mobj_t* source, mobj_t* target)
             source->player->frags[target->player-players]++;
 
             // villsa [STRIFE] new messages when fragging players
+            // haleyjd 20141024: corrected; uses player->allegiance, not mo->miscdata
             DEH_snprintf(plrkilledmsg, sizeof(plrkilledmsg),
                          "%s killed %s",
-                         player_names[source->player->mo->miscdata],
-                         player_names[target->player->mo->miscdata]);
+                         player_names[source->player->allegiance],
+                         player_names[target->player->allegiance]);
 
             if(netgame)
                 players[consoleplayer].message = plrkilledmsg;
-- 
cgit v1.2.3