From d357b7956f18f45aeb1a1dce064aaeafa4ab3aa8 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Fri, 23 May 2025 14:44:32 -0400 Subject: [PATCH] - fix ironlich whirlwind blaming the victim for its damage --- .../static/zscript/actors/heretic/ironlich.zs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wadsrc/static/zscript/actors/heretic/ironlich.zs b/wadsrc/static/zscript/actors/heretic/ironlich.zs index b7831f045..f5d2b600d 100644 --- a/wadsrc/static/zscript/actors/heretic/ironlich.zs +++ b/wadsrc/static/zscript/actors/heretic/ironlich.zs @@ -299,29 +299,29 @@ class Whirlwind : Actor Stop; } - override int DoSpecialDamage (Actor target, int damage, Name damagetype) + override int DoSpecialDamage (Actor victim, int damage, Name damagetype) { int randVal; if (!target.bDontThrust) { - target.angle += Random2[WhirlwindDamage]() * (360 / 4096.); - target.Vel.X += Random2[WhirlwindDamage]() / 64.; - target.Vel.Y += Random2[WhirlwindDamage]() / 64.; + victim.angle += Random2[WhirlwindDamage]() * (360 / 4096.); + victim.Vel.X += Random2[WhirlwindDamage]() / 64.; + victim.Vel.Y += Random2[WhirlwindDamage]() / 64.; } - if ((Level.maptime & 16) && !target.bBoss && !target.bDontThrust) + if ((Level.maptime & 16) && !victim.bBoss && !victim.bDontThrust) { randVal = min(160, random[WhirlwindSeek]()); - target.Vel.Z += randVal / 32.; - if (target.Vel.Z > 12) + victim.Vel.Z += randVal / 32.; + if (victim.Vel.Z > 12) { - target.Vel.Z = 12; + victim.Vel.Z = 12; } } if (!(Level.maptime & 7)) { - target.DamageMobj (null, target, 3, 'Melee'); + target.DamageMobj (null, victim, 3, 'Melee'); } return -1; }