-Fixed: WhirlWind was still able to affect actors with the FULLMASS flag.

This commit is contained in:
MajorCooke 2014-10-27 22:40:25 -05:00
parent c01d1a8003
commit 774db445ec

View file

@ -28,10 +28,14 @@ int AWhirlwind::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{ {
int randVal; int randVal;
target->angle += pr_foo.Random2() << 20; if (!(target->flags7 & MF7_FULLMASS))
target->velx += pr_foo.Random2() << 10; {
target->vely += pr_foo.Random2() << 10; target->angle += pr_foo.Random2() << 20;
if ((level.time & 16) && !(target->flags2 & MF2_BOSS)) target->velx += pr_foo.Random2() << 10;
target->vely += pr_foo.Random2() << 10;
}
if ((level.time & 16) && !(target->flags2 & MF2_BOSS) && !(target->flags7 & MF7_FULLMASS))
{ {
randVal = pr_foo(); randVal = pr_foo();
if (randVal > 160) if (randVal > 160)