From 774db445ec815be0099e7b3fba08c4ffb1bc3eb0 Mon Sep 17 00:00:00 2001 From: MajorCooke Date: Mon, 27 Oct 2014 22:40:25 -0500 Subject: [PATCH] -Fixed: WhirlWind was still able to affect actors with the FULLMASS flag. --- src/g_heretic/a_ironlich.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/g_heretic/a_ironlich.cpp b/src/g_heretic/a_ironlich.cpp index d8c1fd285c..d2e49a0f3e 100644 --- a/src/g_heretic/a_ironlich.cpp +++ b/src/g_heretic/a_ironlich.cpp @@ -28,10 +28,14 @@ int AWhirlwind::DoSpecialDamage (AActor *target, int damage, FName damagetype) { int randVal; - target->angle += pr_foo.Random2() << 20; - target->velx += pr_foo.Random2() << 10; - target->vely += pr_foo.Random2() << 10; - if ((level.time & 16) && !(target->flags2 & MF2_BOSS)) + if (!(target->flags7 & MF7_FULLMASS)) + { + target->angle += pr_foo.Random2() << 20; + 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(); if (randVal > 160)