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

[Client] Don't declare variable twice in LocalPlayer's setEquipment()

Browse source 
The variable equipmentItem is identical to currentItem, so it should not have been added in commit 58a6a8c3bc

Addditionally, use a more descriptive variable name than "a" for item Ptrs.
This commit is contained in:
David Cernat 2018-08-11 15:28:03 +03:00
parent 5d66a9bb66
commit a1933e7bc2
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/LocalPlayer.cpp
View file

@ -530,6 +530,7 @@ void LocalPlayer::updateInventory(bool forceUpdate)
item.charge = iter.getCellRef().getCharge(); item.charge = iter.getCellRef().getCharge();
item.enchantmentCharge = iter.getCellRef().getEnchantmentCharge(); item.enchantmentCharge = iter.getCellRef().getEnchantmentCharge();
item.soul = iter.getCellRef().getSoul(); item.soul = iter.getCellRef().getSoul();
return false; return false;
}; };
@ -1111,22 +1112,21 @@ void LocalPlayer::setEquipment()
if (!currentItem.refId.empty()) if (!currentItem.refId.empty())
{ {
auto it = find_if(ptrInventory.begin(), ptrInventory.end(), [&currentItem](const MWWorld::Ptr &a) { auto it = find_if(ptrInventory.begin(), ptrInventory.end(), [&currentItem](const MWWorld::Ptr &itemPtr) {
return Misc::StringUtils::ciEqual(a.getCellRef().getRefId(), currentItem.refId); return Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), currentItem.refId);
}); });
if (it == ptrInventory.end()) // If the item is not in our inventory, add it if (it == ptrInventory.end()) // If the item is not in our inventory, add it
{ {
auto equipmentItem = equipmentItems[slot];
try try
{ {
auto addIter = ptrInventory.ContainerStore::add(equipmentItem.refId.c_str(), equipmentItem.count, ptrPlayer); auto addIter = ptrInventory.ContainerStore::add(currentItem.refId.c_str(), currentItem.count, ptrPlayer);
ptrInventory.equip(slot, addIter, ptrPlayer); ptrInventory.equip(slot, addIter, ptrPlayer);
} }
catch (std::exception&) catch (std::exception&)
{ {
LOG_APPEND(Log::LOG_INFO, "- Ignored addition of invalid equipment item %s", equipmentItem.refId.c_str()); LOG_APPEND(Log::LOG_INFO, "- Ignored addition of invalid equipment item %s", currentItem.refId.c_str());
} }
} }
else else