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

[Client] Use clearer variable names in DedicatedPlayer::setEquipment()

Browse source
This commit is contained in:
David Cernat 2018-09-24 10:11:42 +03:00
parent 995d20348f
commit 3f304866fd
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/openmw/mwmp/DedicatedPlayer.cpp
View file

@ -309,30 +309,32 @@ void DedicatedPlayer::setEquipment()
{
MWWorld::ContainerStoreIterator it = invStore.getSlot(slot);
const string &dedicItem = equipmentItems[slot].refId;
std::string item = "";
const string &packetItemId = equipmentItems[slot].refId;
std::string ptrItemId = "";
bool equal = false;
if (it != invStore.end())
{
item = it->getCellRef().getRefId();
if (!Misc::StringUtils::ciEqual(item, dedicItem)) // if other item equiped
ptrItemId = it->getCellRef().getRefId();
if (!Misc::StringUtils::ciEqual(ptrItemId, packetItemId)) // if other item is now equipped
{
MWWorld::ContainerStore &store = ptr.getClass().getContainerStore(ptr);
store.remove(item, store.count(item), ptr);
store.remove(ptrItemId, store.count(ptrItemId), ptr);
}
else
equal = true;
}
if (dedicItem.empty() || equal)
if (packetItemId.empty() || equal)
continue;
const int count = equipmentItems[slot].count;
ptr.getClass().getContainerStore(ptr).add(dedicItem, count, ptr);
ptr.getClass().getContainerStore(ptr).add(packetItemId, count, ptr);
for (const auto &itemPtr : invStore)
{
if (::Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), dedicItem)) // equip item
if (::Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), packetItemId)) // equip item
{
std::shared_ptr<MWWorld::Action> action = itemPtr.getClass().use(itemPtr);
action->execute(ptr);