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

- HITTARGET, HITMASTER and HITTRACER now apply to actors that bounce off of other actors.

Browse source
This commit is contained in:
MajorCooke 2014-12-19 13:43:24 -06:00
parent 24f1bfae99
commit 31ad642843
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_map.cpp
View file

@ -3003,6 +3003,10 @@ bool P_BounceActor(AActor *mo, AActor *BlockingMobj, bool ontop)
{ {
if (mo->bouncecount > 0 && --mo->bouncecount == 0) return false; if (mo->bouncecount > 0 && --mo->bouncecount == 0) return false;
if (mo->flags7 & MF7_HITTARGET) mo->target = BlockingMobj;
if (mo->flags7 & MF7_HITMASTER) mo->master = BlockingMobj;
if (mo->flags7 & MF7_HITTRACER) mo->tracer = BlockingMobj;
if (!ontop) if (!ontop)
{ {
fixed_t speed; fixed_t speed;