Skip to content

Commit

Permalink
Update gamepad scroll descriptions to match logic in plrctrls
Browse files Browse the repository at this point in the history
  • Loading branch information
StephenCWills authored and AJenbo committed Feb 18, 2025
1 parent 8b09e0a commit 8f2154f
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Source/items.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 8f2154f

Please sign in to comment.