AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-29 16:11:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Client] Update DedicatedActor to C++11

Browse Source
This commit is contained in:
Koncord 2017-06-27 22:25:39 +08:00
parent 8f7da49152
commit 2427a4f877
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/openmw/mwmp/DedicatedActor.cpp
View File

@ -178,9 +178,7 @@ void DedicatedActor::setEquipment()
storeRefId = it->getCellRef().getRefId(); storeRefId = it->getCellRef().getRefId();
if (!Misc::StringUtils::ciEqual(storeRefId, packetRefId)) // if other item equiped if (!Misc::StringUtils::ciEqual(storeRefId, packetRefId)) // if other item equiped
{
invStore.unequipSlot(slot, ptr); invStore.unequipSlot(slot, ptr);
}
else else
equal = true; equal = true;
} }
@ -227,14 +225,10 @@ void DedicatedActor::playSound()
bool DedicatedActor::hasItem(std::string refId, int charge) bool DedicatedActor::hasItem(std::string refId, int charge)
{ {
MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr); for (const auto &ptr : ptr.getClass().getInventoryStore(ptr))
for (MWWorld::ContainerStoreIterator it = invStore.begin(); it != invStore.end(); ++it)
{ {
if (::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), refId) && it->getCellRef().getCharge() == charge) if (::Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), refId) && ptr.getCellRef().getCharge() == charge)
{
return true; return true;
}
} }
return false; return false;
@ -242,14 +236,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)
{ {
MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr); for (const auto &ptr : ptr.getClass().getInventoryStore(ptr))
for (MWWorld::ContainerStoreIterator it = invStore.begin(); it != invStore.end(); ++it)
{ {
if (::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), refId) && it->getCellRef().getCharge() == charge) if (::Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), refId) && ptr.getCellRef().getCharge() == charge)
{ {
std::shared_ptr<MWWorld::Action> action = it->getClass().use(*it); std::shared_ptr<MWWorld::Action> action = ptr.getClass().use(ptr);
action->execute(ptr); action->execute(this->ptr);
break; break;
} }
} }