teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Cllient] Differentiate itemPtr from actor Ptr in DedicatedActor methods

Browse source 
2427a4f877 mistakenly used the variable name "ptr" for both the actor and the items in that actor's inventory.
This commit is contained in:
David Cernat 2018-07-21 10:16:51 +03:00
parent b6324e3532
commit f1315ef30d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwmp/DedicatedActor.cpp
View file

@ -341,9 +341,9 @@ void DedicatedActor::playSound()
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;
}
@ -352,12 +352,12 @@ bool DedicatedActor::hasItem(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);
action->execute(this->ptr);
std::shared_ptr<MWWorld::Action> action = itemPtr.getClass().use(itemPtr);
action->execute(ptr);
break;
}
}