shithub: choc

Download patch

ref: ee236f29242c8463daf85b155338eef12bf222b4
parent: 2363b1366ed227b54f9815a6ea4a0915843ca0c7
author: James Haley <haleyjd@hotmail.com>
date: Thu Oct 23 20:52:53 EDT 2014 

Upstream fix 2

Incorrect field being used to retrieve player names during deathmatch
for "%s killed %s" msg; changed to match disassembly.


--- a/src/strife/p_inter.c
+++ b/src/strife/p_inter.c
@@ -781,10 +781,11 @@
             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;