From 1482052c8ac3753a56fd39a854eedbc3b85e6c59 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 15 Sep 2022 01:05:42 +0200 Subject: [PATCH] - fixed: chickens in RRRA did not autoaim in hitscan-only mode. since these are homing missiles they always need to acquire a target, regardless of autoaim mode. --- source/games/duke/src/player.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/player.cpp index fc8c8577d..306c98938 100644 --- a/source/games/duke/src/player.cpp +++ b/source/games/duke/src/player.cpp @@ -275,9 +275,13 @@ DDukeActor* aim(DDukeActor* actor, int aang) { weap = aplWeaponWorksLike(plr->curr_weapon, actor->spr.yvel); } - if (weap > CHAINGUN_WEAPON || weap == KNEE_WEAPON) + // The chickens in RRRA are homing and must always autoaim. + if (!isRRRA() || plr->curr_weapon != CHICKEN_WEAPON) { - return nullptr; + if (weap > CHAINGUN_WEAPON || weap == KNEE_WEAPON) + { + return nullptr; + } } }