zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-20 10:32:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed a crash when a player dies in damage floors.

Browse source
This commit is contained in:
Edoardo Prezioso 2015-09-09 21:26:44 +02:00
parent 364ca11b43
commit 19c702a608
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_interaction.cpp
View file

@ -184,7 +184,6 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker, int dmgf
const char *message; const char *message;
const char *messagename; const char *messagename;
char gendermessage[1024]; char gendermessage[1024];
bool friendly;
int gender; int gender;
// No obituaries for non-players, voodoo dolls or when not wanted // 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) if (inflictor && inflictor->player && inflictor->player->mo != inflictor)
MeansOfDeath = NAME_None; MeansOfDeath = NAME_None;
friendly = (self->player != attacker->player && self->IsTeammate(attacker));
mod = MeansOfDeath; mod = MeansOfDeath;
message = NULL; message = NULL;
messagename = 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 (message == NULL && attacker != NULL && attacker->player != NULL)
{ {
if (friendly) if (self->player != attacker->player && self->IsTeammate(attacker))
{ {
self = attacker; self = attacker;
gender = self->player->userinfo.GetGender(); gender = self->player->userinfo.GetGender();