[Cllient] Differentiate itemPtr from actor Ptr in DedicatedActor methods

2427a4f877 mistakenly used the variable name "ptr" for both the actor and the items in that actor's inventory.
remotes/1728160796594174844/tmp_0.7.0-alpha
David Cernat 7 years ago
parent b6324e3532
commit f1315ef30d

@ -341,9 +341,9 @@ void DedicatedActor::playSound()
bool DedicatedActor::hasItem(std::string refId, int charge) bool DedicatedActor::hasItem(std::string refId, int charge)
{ {
for (const auto &ptr : ptr.getClass().getInventoryStore(ptr)) for (const auto &itemPtr : ptr.getClass().getInventoryStore(ptr))
{ {
if (::Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), refId) && ptr.getCellRef().getCharge() == charge) if (::Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), refId) && itemPtr.getCellRef().getCharge() == charge)
return true; return true;
} }
@ -352,12 +352,12 @@ bool DedicatedActor::hasItem(std::string refId, int charge)
void DedicatedActor::equipItem(std::string refId, int charge) void DedicatedActor::equipItem(std::string refId, int charge)
{ {
for (const auto &ptr : ptr.getClass().getInventoryStore(ptr)) for (const auto &itemPtr : ptr.getClass().getInventoryStore(ptr))
{ {
if (::Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), refId) && ptr.getCellRef().getCharge() == charge) if (::Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), refId) && itemPtr.getCellRef().getCharge() == charge)
{ {
std::shared_ptr<MWWorld::Action> action = ptr.getClass().use(ptr); std::shared_ptr<MWWorld::Action> action = itemPtr.getClass().use(itemPtr);
action->execute(this->ptr); action->execute(ptr);
break; break;
} }
} }

Loading…
Cancel
Save