diff options
| author | James Haley | 2014-10-24 00:52:53 -0500 |
|---|---|---|
| committer | James Haley | 2014-10-24 00:52:53 -0500 |
| commit | ee236f29242c8463daf85b155338eef12bf222b4 (patch) | |
| tree | b2ca764f5e9d6e27f8d14b9dbe2560cef348a07f | |
| parent | 2363b1366ed227b54f9815a6ea4a0915843ca0c7 (diff) | |
| download | chocolate-doom-ee236f29242c8463daf85b155338eef12bf222b4.tar.gz chocolate-doom-ee236f29242c8463daf85b155338eef12bf222b4.tar.bz2 chocolate-doom-ee236f29242c8463daf85b155338eef12bf222b4.zip | |
Upstream fix 2
Incorrect field being used to retrieve player names during deathmatch
for "%s killed %s" msg; changed to match disassembly.
| -rw-r--r-- | src/strife/p_inter.c | 5 |
1 files 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; |