From a1ee43c33471cb4ca5f2c7b817215c741b5c80de Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 8 Jan 2024 02:22:55 -0800 Subject: [PATCH] Super Flicky: do not spawn speed lines within pecking radius --- src/objects/super-flicky.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/objects/super-flicky.cpp b/src/objects/super-flicky.cpp index 0c4662fa6..3637f6d3e 100644 --- a/src/objects/super-flicky.cpp +++ b/src/objects/super-flicky.cpp @@ -420,19 +420,27 @@ struct Flicky : mobj_t fly(Fly::kNormal); } + auto speed_lines = [&](angle_t dir) + { + if (dist > kPeckingRadius * mapobjectscale) + { + spawn_speed_lines(dir); + } + }; + if (d > ANGLE_45 && dist > kFlightRadius * mapobjectscale) { // Cut momentum when too far outside of intended trajectory momx = FixedMul(momx, kRebound); momy = FixedMul(momy, kRebound); - spawn_speed_lines(th); + speed_lines(th); fly(Fly::kSlow); } else { - spawn_speed_lines(angle); + speed_lines(angle); } // Returning to owner