From f356e356a01724883d827ea8aba2c7a9ed1e13cc Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 21 Jun 2006 12:10:36 +0000 Subject: [PATCH] - Fixed: The obituary code didn't use the attacker's name for kills caused by other players. SVN r207 (trunk) --- docs/rh-log.txt | 2 ++ src/p_interaction.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 2ac52f24c6..31ca6debee 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ June 21, 2006 (Changes by Graf Zahl) +- Fixed: The obituary code didn't use the attacker's name for kills caused + by other players. - Fixed: PIT_StompThing never checked for COMPATF_NO_PASSMOBJ. - Fixed: COMPATF_TRACE returned true for all two-sided lines, not just for those with the same sector on both sides. diff --git a/src/p_interaction.cpp b/src/p_interaction.cpp index 080789a5a4..f7e2e24661 100644 --- a/src/p_interaction.cpp +++ b/src/p_interaction.cpp @@ -295,6 +295,7 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker) } } } + else attacker = self; // for the message creation if (message != NULL && message[0] == '$') { @@ -307,7 +308,7 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker) } SexMessage (message, gendermessage, gender, - self->player->userinfo.netname, self->player->userinfo.netname); + self->player->userinfo.netname, attacker->player->userinfo.netname); Printf (PRINT_MEDIUM, "%s\n", gendermessage); }