MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gamepad] Allow for mixed mode navigation in inventory

Browse source
This commit is contained in:
Anders Jenbo 2021-10-18 04:32:49 +02:00
commit b3a9a2ddce
4 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Source/controls/plrctrls.cpp
View file

@ -566,7 +566,7 @@ Point GetSlotCoord(int slot)
}
/**
* Return the item id of the current tile
* Return the item id of the current slot
*/
int GetItemIdOnSlot(int slot)
{
@ -605,9 +605,7 @@ Size GetItemSizeOnSlot(int slot)
void ResetInvCursorPosition()
{
Point mousePos {};
if (Slot < SLOTXY_INV_FIRST) {
mousePos = InvGetEquipSlotCoordFromInvSlot((inv_xy_slot)Slot);
} else if (Slot < SLOTXY_BELT_FIRST) {
if (Slot >= SLOTXY_INV_FIRST && Slot <= SLOTXY_INV_LAST) {
int8_t itemInvId = GetItemIdOnSlot(Slot);
// search the 'first slot' for that item in the inventory, it should have the positive number of that same InvId
@ -626,8 +624,10 @@ void ResetInvCursorPosition()
mousePos = GetSlotCoord(Slot);
mousePos.x += ((itemSize.width - 1) * InventorySlotSizeInPixels.width) / 2;
mousePos.y += ((itemSize.height - 1) * InventorySlotSizeInPixels.height) / 2;
} else {
} else if (Slot >= SLOTXY_BELT_FIRST && Slot <= SLOTXY_BELT_LAST) {
mousePos = GetSlotCoord(Slot);
} else {
mousePos = InvGetEquipSlotCoordFromInvSlot((inv_xy_slot)Slot);
}
mousePos.x += (InventorySlotSizeInPixels.width / 2);
@ -636,6 +636,23 @@ void ResetInvCursorPosition()
SetCursorPos(mousePos);
}
int FindClosestInventorySlot(Point mousePos)
{
int shortestDistance = std::numeric_limits<int>::max();
int bestSlot = 0;
mousePos += Displacement { -INV_SLOT_HALF_SIZE_PX, INV_SLOT_HALF_SIZE_PX };
for (int i = 0; i < NUM_XY_SLOTS; i++) {
int distance = mousePos.ManhattanDistance(GetSlotCoord(i));
if (distance < shortestDistance) {
shortestDistance = distance;
bestSlot = i;
}
}
return bestSlot;
}
/**
* Move the cursor around in our inventory
* If mouse coords are at SLOTXY_CHEST_LAST, consider this center of equipment
@ -654,7 +671,7 @@ void InvMove(AxisDirection dir)
// normalize slots
if (Slot < 0)
Slot = 0;
Slot = FindClosestInventorySlot(mousePos);
else if (Slot >= SLOTXY_HEAD_FIRST && Slot <= SLOTXY_HEAD_LAST)
Slot = SLOTXY_HEAD_FIRST;
else if (Slot >= SLOTXY_HAND_LEFT_FIRST && Slot <= SLOTXY_HAND_LEFT_LAST)
@ -1230,6 +1247,7 @@ void HandleRightStickMotion()
{ // move cursor
sgbControllerActive = false;
InvalidateInventorySlot();
int x = MousePosition.x;
int y = MousePosition.y;
acc.Pool(&x, &y, 2);
@ -1248,6 +1266,11 @@ void HandleRightStickMotion()
}
}
void InvalidateInventorySlot()
{
Slot = -1;
}
/**
* @brief Moves the mouse to the first inventory slot.
*/