stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-25 22:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

re-introduce the thing == tmthing->target check, so it applies to non-players

Browse source
This commit is contained in:
Arthur 2024-02-16 12:27:25 -05:00
parent 5e29cd84a2
commit dc625496d8
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_map.c
View file

@ -1279,7 +1279,8 @@ static unsigned PIT_DoCheckThing(mobj_t *thing)
if (tmthing->type != MT_SHELL && tmthing->target && tmthing->target->type == thing->type)
{
// Don't hit yourself, and if a player, don't hit bots
if (thing->player && tmthing->target->player && !P_CanPlayerHurtPlayer(thing->player, tmthing, tmthing->target->player, 0))
if (thing == tmthing->target
|| (thing->player && tmthing->target->player && !P_CanPlayerHurtPlayer(thing->player, tmthing, tmthing->target->player, 0)))
return CHECKTHING_IGNORE;
if (thing->type != MT_PLAYER)