Merge branch 'development' of https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source into development

Author: MaximDude

CHANGELOG.md

@@ -476,7 +476,7 @@ This can be accessed via the new Lua (R/W) `SettingsMan` property `AIUpdateInter
 	Shift-clicking an item (or Shift + Fire in keyboard-only) in the cart will now empty the entire cart.  
 	Items in the cart will be indented to signify what actor's inventory they belong to.  
 	Middle-clicking (or pressing the Pickup key) on an item will duplicate it. This also duplicates an actor's inventory.  
-	You can now reorganize the cart by click-dragging, or by holding the item selection key and inputting up/down.
+	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.
 
 - Added to Lua enum `ControlState` the state `RELEASE_FACEBUTTON`.
 

Menus/BuyMenuGUI.cpp

@@ -1606,7 +1606,8 @@ void BuyMenuGUI::Update()
         }
 
         // Fire button removes items from the order list, including equipment on AHumans
-        if (m_pController->IsState(RELEASE_FACEBUTTON) && !m_IsDragging) {
+		bool isKeyboardControlled = !m_pController->IsMouseControlled() && !m_pController->IsGamepadControlled();
+        if (isKeyboardControlled ? (m_pController->IsState(PRESS_FACEBUTTON) && !m_pController->IsState(AIM_SHARP)) : (m_pController->IsState(RELEASE_FACEBUTTON) && !m_IsDragging)) {
 			if (g_UInputMan.FlagShiftState()) {
 				ClearCartList();
 				pItem = nullptr;
@@ -1641,7 +1642,7 @@ void BuyMenuGUI::Update()
             DuplicateCartItem(m_ListItemIndex);
         }
 
-        if (m_pController->IsState(PRESS_FACEBUTTON)) {
+        if (isKeyboardControlled ? m_pController->IsState(AIM_SHARP) : m_pController->IsState(PRESS_FACEBUTTON)) {
             m_DraggedItemIndex = m_pCartList->GetSelectedIndex();
         } else if (m_pController->IsState(RELEASE_FACEBUTTON)) {
             m_DraggedItemIndex = -1;