OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: CreateDamageFunction needs to return NULL for a damage value of 0 to preserve the collision detection handling of non-damaging actors.

Browse source 
SVN r3920 (scripting)
This commit is contained in:
Christoph Oelckers 2012-10-28 06:56:56 +00:00
commit b630410372
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/p_mobj.cpp
View file

@ -3410,7 +3410,8 @@ void AActor::Tick ()
// won't hurt anything. Don't do this if damage is 0! That way, you can
// still have missiles that go straight up and down through actors without
// damaging anything.
if ((flags & MF_MISSILE) && (velx|vely) == 0 && Damage != 0)
// (for backwards compatibility this must check for lack of damage function, not for zero damage!)
if ((flags & MF_MISSILE) && (velx|vely) == 0 && Damage != NULL)
{
velx = 1;
}