mirror of
https://github.com/ZDoom/qzdoom-gpl.git
synced 2024-11-15 08:41:59 +00:00
Merge pull request #376 from edward-san/friendly_frag_crash
- Fixed a crash when a player dies in damage floors.
This commit is contained in:
commit
3a37a32cf9
1 changed files with 1 additions and 4 deletions
|
@ -184,7 +184,6 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker, int dmgf
|
|||
const char *message;
|
||||
const char *messagename;
|
||||
char gendermessage[1024];
|
||||
bool friendly;
|
||||
int gender;
|
||||
|
||||
// No obituaries for non-players, voodoo dolls or when not wanted
|
||||
|
@ -197,8 +196,6 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker, int dmgf
|
|||
if (inflictor && inflictor->player && inflictor->player->mo != inflictor)
|
||||
MeansOfDeath = NAME_None;
|
||||
|
||||
friendly = (self->player != attacker->player && self->IsTeammate(attacker));
|
||||
|
||||
mod = MeansOfDeath;
|
||||
message = NULL;
|
||||
messagename = NULL;
|
||||
|
@ -266,7 +263,7 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker, int dmgf
|
|||
|
||||
if (message == NULL && attacker != NULL && attacker->player != NULL)
|
||||
{
|
||||
if (friendly)
|
||||
if (self->player != attacker->player && self->IsTeammate(attacker))
|
||||
{
|
||||
self = attacker;
|
||||
gender = self->player->userinfo.GetGender();
|
||||
|
|
Loading…
Reference in a new issue