Browse Source

Rename inventory Na-Krul combine path

Rename the inventory-insert combine helper to clarify that it runs after an item is inserted into InvList.
This keeps the separate flow-specific entry point but makes its purpose clearer during review.
pull/8504/head
morfidon 5 days ago
parent
commit
2fb27f9fea
  1. 8
      Source/inv.cpp

8
Source/inv.cpp

@ -175,7 +175,7 @@ std::array<_item_indexes, 2> GetOtherNaKrulNotes(_item_indexes preservedNoteId)
} }
} }
int TryCombineInsertedNaKrulNote(Player &player, int insertedInvIndex) int TryCombineNaKrulNoteAfterInventoryInsert(Player &player, int insertedInvIndex)
{ {
if (insertedInvIndex < 0 || insertedInvIndex >= player._pNumInv) { if (insertedInvIndex < 0 || insertedInvIndex >= player._pNumInv) {
return insertedInvIndex; return insertedInvIndex;
@ -575,7 +575,7 @@ bool ChangeInvItem(Player &player, int slot, Size itemSize)
if (prevItemId == 0) { if (prevItemId == 0) {
player.InvList[player._pNumInv] = player.HoldItem.pop(); player.InvList[player._pNumInv] = player.HoldItem.pop();
player._pNumInv++; player._pNumInv++;
prevItemId = TryCombineInsertedNaKrulNote(player, player._pNumInv - 1) + 1; prevItemId = TryCombineNaKrulNoteAfterInventoryInsert(player, player._pNumInv - 1) + 1;
} else { } else {
const int invIndex = prevItemId - 1; const int invIndex = prevItemId - 1;
if (player.HoldItem._itype == ItemType::Gold) if (player.HoldItem._itype == ItemType::Gold)
@ -589,7 +589,7 @@ bool ChangeInvItem(Player &player, int slot, Size itemSize)
if (itemIndex == -prevItemId) if (itemIndex == -prevItemId)
itemIndex = 0; itemIndex = 0;
} }
prevItemId = TryCombineInsertedNaKrulNote(player, invIndex) + 1; prevItemId = TryCombineNaKrulNoteAfterInventoryInsert(player, invIndex) + 1;
} }
itemSize = GetInventorySize(player.InvList[prevItemId - 1]); itemSize = GetInventorySize(player.InvList[prevItemId - 1]);
@ -1470,7 +1470,7 @@ bool AutoPlaceItemInInventory(Player &player, const Item &item, bool sendNetwork
player._pNumInv++; player._pNumInv++;
int invIndex = player._pNumInv - 1; int invIndex = player._pNumInv - 1;
if (semantics == InventoryInsertSemantics::PlayerAction) { if (semantics == InventoryInsertSemantics::PlayerAction) {
invIndex = TryCombineInsertedNaKrulNote(player, invIndex); invIndex = TryCombineNaKrulNoteAfterInventoryInsert(player, invIndex);
} }
AddItemToInvGrid(player, *targetSlot, invIndex + 1, GetInventorySize(player.InvList[invIndex]), sendNetworkMessage); AddItemToInvGrid(player, *targetSlot, invIndex + 1, GetInventorySize(player.InvList[invIndex]), sendNetworkMessage);

Loading…
Cancel
Save