vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'mf_pain-fix' into 'next' 

Fix dead MF_PAIN objects hurting the player

Makes MF_PAIN check for health before damaging the player. Fixes issue #12

See merge request !47
This commit is contained in:
Inuyasha 2016-02-25 18:10:08 -05:00
parent 5d1c8d2968 e43f21cdda
commit 8cf74f5044
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/p_map.c
View File

@ -503,7 +503,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; // overhead
if (thing->z + thing->height < tmthing->z)
return true; // underneath
if (tmthing->player && tmthing->flags & MF_SHOOTABLE)
if (tmthing->player && tmthing->flags & MF_SHOOTABLE && thing->health > 0)
P_DamageMobj(tmthing, thing, thing, 1);
return true;
}
@ -514,7 +514,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; // overhead
if (tmthing->z + tmthing->height < thing->z)
return true; // underneath
if (thing->player && thing->flags & MF_SHOOTABLE)
if (thing->player && thing->flags & MF_SHOOTABLE && tmthing->health > 0)
P_DamageMobj(thing, tmthing, tmthing, 1);
return true;
}