OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'hitpointer2' of https://github.com/MajorCooke/zdoom

Browse source 
Conflicts:
	src/actor.h
	src/thingdef/thingdef_data.cpp
This commit is contained in:
Christoph Oelckers 2014-12-10 11:48:32 +01:00
commit 6afe9cc048
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/p_mobj.cpp
View file

@ -1202,6 +1202,9 @@ void P_ExplodeMissile (AActor *mo, line_t *line, AActor *target)
if (target != NULL && ((target->flags & (MF_SHOOTABLE|MF_CORPSE)) || (target->flags6 & MF6_KILLED)) )
{
if (target->flags7 & MF7_HITTARGET) mo->target = target;
if (target->flags7 & MF7_HITMASTER) mo->master = target;
if (target->flags7 & MF7_HITTRACER) mo->tracer = target;
if (target->flags & MF_NOBLOOD) nextstate = mo->FindState(NAME_Crash);
if (nextstate == NULL) nextstate = mo->FindState(NAME_Death, NAME_Extreme);
}