mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 20:19:57 +00:00
Code Issues Releases Wiki Activity

[Client] Only add valid inventory & equipment items to LocalPlayer

Browse source 
Also add related debug information.
This commit is contained in:
David Cernat 2017-08-31 08:35:46 +03:00
parent c3d1eada89
commit 134dd06d48
4 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -636,9 +636,16 @@ void LocalPlayer::addItems()
for (const auto &item : inventoryChanges.items)
{
MWWorld::Ptr itemPtr = *ptrStore.add(item.refId, item.count, ptrPlayer);
if (item.charge != -1)
itemPtr.getCellRef().setCharge(item.charge);
try
{
MWWorld::Ptr itemPtr = *ptrStore.add(item.refId, item.count, ptrPlayer);
if (item.charge != -1)
itemPtr.getCellRef().setCharge(item.charge);
}
catch (std::exception&)
{
LOG_APPEND(Log::LOG_INFO, "- Ignored addition of invalid inventory item %s", item.refId.c_str());
}
}
}
@ -651,6 +658,8 @@ void LocalPlayer::addSpells()
// Only add spells that are ensured to exist
if (MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(spell.mId))
ptrSpells.add(spell.mId);
else
LOG_APPEND(Log::LOG_INFO, "- Ignored addition of invalid spell %s", spell.mId.c_str());
}
void LocalPlayer::addJournalItems()
@ -891,11 +900,19 @@ void LocalPlayer::setEquipment()
return Misc::StringUtils::ciEqual(a.getCellRef().getRefId(), currentItem.refId);
});
if (it == ptrInventory.end()) // if not exists add item
if (it == ptrInventory.end()) // If the item is not in our inventory, add it
{
auto equipped = equipedItems[slot];
auto addIter = ptrInventory.ContainerStore::add(equipped.refId.c_str(), equipped.count, ptrPlayer);
ptrInventory.equip(slot, addIter, ptrPlayer);
try
{
auto addIter = ptrInventory.ContainerStore::add(equipped.refId.c_str(), equipped.count, ptrPlayer);
ptrInventory.equip(slot, addIter, ptrPlayer);
}
catch (std::exception&)
{
LOG_APPEND(Log::LOG_INFO, "- Ignored addition of invalid equipment item %s", equipped.refId.c_str());
}
}
else
ptrInventory.equip(slot, it, ptrPlayer);

2
apps/openmw/mwmp/processors/player/ProcessorPlayerEquipment.hpp
View file

@ -22,6 +22,8 @@ namespace mwmp
{
if (isLocal())
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_PLAYER_EQUIPMENT about LocalPlayer from server");
if (isRequest())
static_cast<LocalPlayer*>(player)->updateEquipment(true);
else

2
apps/openmw/mwmp/processors/player/ProcessorPlayerInventory.hpp
View file

@ -21,6 +21,8 @@ namespace mwmp
{
if (!isLocal()) return;
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_PLAYER_INVENTORY about LocalPlayer from server");
if (isRequest())
static_cast<LocalPlayer*>(player)->updateInventory(true);
else

2
apps/openmw/mwmp/processors/player/ProcessorPlayerSpellbook.hpp
View file

@ -22,6 +22,8 @@ namespace mwmp
{
if (!isLocal()) return;
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received ID_PLAYER_SPELLBOOK about LocalPlayer from server");
if (isRequest())
static_cast<LocalPlayer*>(player)->sendSpellbook();
else