From cd1fc590a7af1998c21b90cd0e66f405631ffa16 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Sat, 21 Jul 2018 16:14:07 +0300 Subject: [PATCH] [Client] Differentiate itemPtr from actor Ptr in DedicatedPlayer method This fixes a mistake from 8f7da49152deeda0f2b0e25dd9e6ffe9885e0f4f --- apps/openmw/mwmp/DedicatedPlayer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwmp/DedicatedPlayer.cpp b/apps/openmw/mwmp/DedicatedPlayer.cpp index c5bb3ab4a..2e26c586b 100644 --- a/apps/openmw/mwmp/DedicatedPlayer.cpp +++ b/apps/openmw/mwmp/DedicatedPlayer.cpp @@ -335,12 +335,12 @@ void DedicatedPlayer::setEquipment() const int count = equipmentItems[slot].count; ptr.getClass().getContainerStore(ptr).add(dedicItem, count, ptr); - for (const auto &ptr : invStore) + for (const auto &itemPtr : invStore) { - if (::Misc::StringUtils::ciEqual(ptr.getCellRef().getRefId(), dedicItem)) // equip item + if (::Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), dedicItem)) // equip item { - std::shared_ptr action = ptr.getClass().use(ptr); - action->execute(this->ptr); + std::shared_ptr action = itemPtr.getClass().use(itemPtr); + action->execute(ptr); break; } }