|
|
@ -1,5 +1,6 @@
|
|
|
|
#include <components/esm/esmwriter.hpp>
|
|
|
|
#include <components/esm/esmwriter.hpp>
|
|
|
|
#include <components/openmw-mp/Log.hpp>
|
|
|
|
#include <components/openmw-mp/Log.hpp>
|
|
|
|
|
|
|
|
#include <components/openmw-mp/Utils.hpp>
|
|
|
|
|
|
|
|
|
|
|
|
#include "../mwbase/environment.hpp"
|
|
|
|
#include "../mwbase/environment.hpp"
|
|
|
|
#include "../mwbase/journal.hpp"
|
|
|
|
#include "../mwbase/journal.hpp"
|
|
|
@ -476,9 +477,11 @@ void LocalPlayer::updateEquipment(bool forceUpdate)
|
|
|
|
|
|
|
|
|
|
|
|
if (it != invStore.end())
|
|
|
|
if (it != invStore.end())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!::Misc::StringUtils::ciEqual(it->getCellRef().getRefId(), equipmentItems[slot].refId) ||
|
|
|
|
MWWorld::CellRef &cellRef = it->getCellRef();
|
|
|
|
it->getCellRef().getCharge() != item.charge ||
|
|
|
|
|
|
|
|
it->getCellRef().getEnchantmentCharge() != item.enchantmentCharge ||
|
|
|
|
if (Misc::StringUtils::ciEqual(cellRef.getRefId(), item.refId) == false ||
|
|
|
|
|
|
|
|
cellRef.getCharge() != item.charge ||
|
|
|
|
|
|
|
|
Utils::compareFloats(cellRef.getEnchantmentCharge(), item.enchantmentCharge, 1.0f) == false ||
|
|
|
|
it->getRefData().getCount() != item.count ||
|
|
|
|
it->getRefData().getCount() != item.count ||
|
|
|
|
forceUpdate)
|
|
|
|
forceUpdate)
|
|
|
|
{
|
|
|
|
{
|
|
|
|