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

[Client] Fix "invalid iterator" error

Browse source
This commit is contained in:
Koncord 2017-06-29 14:36:56 +08:00
parent 685bf15d52
commit 596f42e408
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwmp/LocalActor.cpp
View file

@ -195,13 +195,12 @@ void LocalActor::updateEquipment(bool forceUpdate)
MWWorld::ContainerStoreIterator it = invStore.getSlot(slot); MWWorld::ContainerStoreIterator it = invStore.getSlot(slot);
auto &item = equipedItems[slot]; auto &item = equipedItems[slot];
auto &cellRef = it->getCellRef(); if (it != invStore.end() && !::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), item.refId))
if (it != invStore.end() && !::Misc::StringUtils::ciEqual(cellRef.getRefId(), item.refId))
{ {
equipmentChanged = true; equipmentChanged = true;
item.refId = cellRef.getRefId(); item.refId = it->getCellRef().getRefId();
item.charge = cellRef.getCharge(); item.charge = it->getCellRef().getCharge();
if (slot == MWWorld::InventoryStore::Slot_CarriedRight) if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
{ {
MWMechanics::WeaponType weaptype; MWMechanics::WeaponType weaptype;
@ -211,7 +210,7 @@ void LocalActor::updateEquipment(bool forceUpdate)
item.count = 1; item.count = 1;
} }
else else
item.count = invStore.count(cellRef.getRefId()); item.count = invStore.count(it->getCellRef().getRefId());
} }
else if (it == invStore.end() && !item.refId.empty()) else if (it == invStore.end() && !item.refId.empty())
{ {