diff --git a/Data/Script/origin/menu/InventorySelectMenu.lua b/Data/Script/origin/menu/InventorySelectMenu.lua index 9a58e89daf..4e1c7de084 100644 --- a/Data/Script/origin/menu/InventorySelectMenu.lua +++ b/Data/Script/origin/menu/InventorySelectMenu.lua @@ -216,7 +216,12 @@ end --- Updates the summary window. function InventorySelectMenu:updateSummary() - self.summary:SetItem(_DATA.Save.ActiveTeam:GetInv(self.slotList[self.menu.CurrentChoiceTotal+1].Slot)) + local selected = self.slotList[self.menu.CurrentChoiceTotal+1] + if selected.IsEquipped then + self.summary:SetItem(_DATA.Save.ActiveTeam.Players.EquippedItem(selected.Slot)) + else + self.summary:SetItem(_DATA.Save.ActiveTeam:GetInv(selected.Slot)) + end end --- Extract the list of selected slots. diff --git a/Data/Script/origin/menu/team/TeamSelectMenu.lua b/Data/Script/origin/menu/team/TeamSelectMenu.lua index b7b519da35..8d62539638 100644 --- a/Data/Script/origin/menu/team/TeamSelectMenu.lua +++ b/Data/Script/origin/menu/team/TeamSelectMenu.lua @@ -79,7 +79,7 @@ function TeamSelectMenu:load_chars(char_list) if type(char_list) == 'table' then for _, char in pairs(char_list) do table.insert(list, char) end else - for char in luanet.each(LUA_ENGINE:MakeList(char_list)) do table.insert(list, char) end + for char in luanet.each(char_list) do table.insert(list, char) end end return list end