zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-01 16:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: If player is killed by world, attacker was not checked for nullptr, causing a crash.

Browse source
This commit is contained in:
Rachael Alexanderson 2017-03-02 06:27:18 -05:00 committed by Christoph Oelckers
parent ff88ecd3f0
commit 26f7902c3f
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p_interaction.cpp
View file

@ -253,6 +253,7 @@ void ClientObituary (AActor *self, AActor *inflictor, AActor *attacker, int dmgf
} }
} }
if (message == nullptr) message = messagename; // fallback to defaults if possible. if (message == nullptr) message = messagename; // fallback to defaults if possible.
if (attacker == nullptr) attacker = self; // world
if (attacker->player == nullptr) attacker = self; // for the message creation if (attacker->player == nullptr) attacker = self; // for the message creation
if (message != NULL && message[0] == '$') if (message != NULL && message[0] == '$')