This repository was archived by the owner on Jan 5, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -476,7 +476,7 @@ This can be accessed via the new Lua (R/W) `SettingsMan` property `AIUpdateInter
476
476
Shift-clicking an item (or Shift + Fire in keyboard-only) in the cart will now empty the entire cart.
477
477
Items in the cart will be indented to signify what actor's inventory they belong to.
478
478
Middle-clicking (or pressing the Pickup key) on an item will duplicate it. This also duplicates an actor's inventory.
479
- You can now reorganize the cart by click-dragging, or by holding the item selection key and inputting up/down.
479
+ You can now reorganize the cart by click-dragging. For kbd-only you can do this by holding the sharp aim key and pressing up/down.
480
480
481
481
- Added to Lua enum ` ControlState ` the state ` RELEASE_FACEBUTTON ` .
482
482
Original file line number Diff line number Diff line change @@ -1606,7 +1606,8 @@ void BuyMenuGUI::Update()
1606
1606
}
1607
1607
1608
1608
// Fire button removes items from the order list, including equipment on AHumans
1609
- if (m_pController->IsState (RELEASE_FACEBUTTON) && !m_IsDragging) {
1609
+ bool isKeyboardControlled = !m_pController->IsMouseControlled () && !m_pController->IsGamepadControlled ();
1610
+ if (isKeyboardControlled ? (m_pController->IsState (PRESS_FACEBUTTON) && !m_pController->IsState (AIM_SHARP)) : (m_pController->IsState (RELEASE_FACEBUTTON) && !m_IsDragging)) {
1610
1611
if (g_UInputMan.FlagShiftState ()) {
1611
1612
ClearCartList ();
1612
1613
pItem = nullptr ;
@@ -1641,7 +1642,7 @@ void BuyMenuGUI::Update()
1641
1642
DuplicateCartItem (m_ListItemIndex);
1642
1643
}
1643
1644
1644
- if (m_pController->IsState (PRESS_FACEBUTTON)) {
1645
+ if (isKeyboardControlled ? m_pController-> IsState (AIM_SHARP) : m_pController->IsState (PRESS_FACEBUTTON)) {
1645
1646
m_DraggedItemIndex = m_pCartList->GetSelectedIndex ();
1646
1647
} else if (m_pController->IsState (RELEASE_FACEBUTTON)) {
1647
1648
m_DraggedItemIndex = -1 ;
You can’t perform that action at this time.
0 commit comments