zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- prevent infinite recursion in PlayerPawn.GetObituary when the inflictor is the same as the origin for the kill.

Browse source
This commit is contained in:
Christoph Oelckers 2017-04-09 00:06:23 +02:00
parent e1698c6d41
commit 5935dc706d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wadsrc/static/zscript/shared/player.txt
View file

@ -144,7 +144,7 @@ class PlayerPawn : Actor native
if (mod == 'Telefrag') return "$OB_MPTELEFRAG"; if (mod == 'Telefrag') return "$OB_MPTELEFRAG";
String message; String message;
if (inflictor != NULL) if (inflictor != NULL && inflictor != self)
{ {
message = inflictor.GetObituary(victim, inflictor, mod, playerattack); message = inflictor.GetObituary(victim, inflictor, mod, playerattack);
} }