From 4b0f5064f6e51871bfeb6ff2276956b04dbf0587 Mon Sep 17 00:00:00 2001 From: Uleat Date: Tue, 20 Jan 2015 01:19:08 -0500 Subject: [PATCH] Fix for Inventory::_HasItemByUse(bucket) using the parent container when searching for bag container items --- changelog.txt | 5 ++++- common/item.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 6cdfa59ee..4f9aea4d3 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,10 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 01/20/2015 == +Uleat: Fix for Inventory::_HasItemByUse(bucket) using the parent container when searching for bag container items. + == 01/19/2015 == -Uleat: Changed 'enum EQClientVersion' to 'enum class ClientVersion.' Other light modifications were made to accomodate this namespace. Added 'RoF2' to the lua client version enumeration. +Uleat: Changed 'enum EQClientVersion' to 'enum class ClientVersion.' Other light modifications were made to accommodate this namespace. Added 'RoF2' to the lua client version enumeration. == 01/15/2015 == Uleat: Attempted fix for elusive inventory bug: diff --git a/common/item.cpp b/common/item.cpp index 533a0817b..ce1690aaf 100644 --- a/common/item.cpp +++ b/common/item.cpp @@ -1259,7 +1259,7 @@ int16 Inventory::_HasItemByUse(std::map& bucket, uint8 use, ui if (!inst->IsType(ItemClassContainer)) { continue; } - for (auto bag_iter = bucket.begin(); bag_iter != bucket.end(); ++bag_iter) { + for (auto bag_iter = inst->_begin(); bag_iter != inst->_end(); ++bag_iter) { auto bag_inst = bag_iter->second; if (bag_inst == nullptr) { continue; }