From 8f2154faca268f4f67bc84c137c29f5dbec990a9 Mon Sep 17 00:00:00 2001 From: staphen Date: Tue, 18 Feb 2025 00:09:18 -0500 Subject: [PATCH] Update gamepad scroll descriptions to match logic in plrctrls --- Source/items.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/items.cpp b/Source/items.cpp index daf13abed..607059398 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -1837,20 +1837,21 @@ void PrintItemMisc(const Item &item) || (item._iMiscId > IMISC_OILFIRST && item._iMiscId < IMISC_OILLAST) || (item._iMiscId > IMISC_RUNEFIRST && item._iMiscId < IMISC_RUNELAST) || item._iMiscId == IMISC_ARENAPOT; - const bool isCastOnTarget = (item._iMiscId == IMISC_SCROLLT && item._iSpell != SpellID::Flash) + const bool mouseRequiresTarget = (item._iMiscId == IMISC_SCROLLT && item._iSpell != SpellID::Flash) || (item._iMiscId == IMISC_SCROLL && IsAnyOf(item._iSpell, SpellID::TownPortal, SpellID::Identify)); + const bool gamepadRequiresTarget = item.isScroll() && TargetsMonster(item._iSpell); switch (ControlMode) { case ControlTypes::None: break; case ControlTypes::KeyboardAndMouse: - printItemMiscKBM(item, isOil, isCastOnTarget); + printItemMiscKBM(item, isOil, mouseRequiresTarget); break; case ControlTypes::VirtualGamepad: - printItemMiscGenericGamepad(item, isOil, isCastOnTarget); + printItemMiscGenericGamepad(item, isOil, gamepadRequiresTarget); break; case ControlTypes::Gamepad: - printItemMiscGamepad(item, isOil, isCastOnTarget); + printItemMiscGamepad(item, isOil, gamepadRequiresTarget); break; } }