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

[Client] Require InventoryStore for autoequipping actors

Browse source
This commit is contained in:
David Cernat 2018-04-01 09:02:26 +03:00
parent afe8c97cb9
commit 258e319acb
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwmp/WorldEvent.cpp
View file

@ -84,6 +84,7 @@ void WorldEvent::editContainers(MWWorld::CellStore* cellStore)
// ptrFound.getCellRef().getRefNum(), ptrFound.getCellRef().getMpNum()); // ptrFound.getCellRef().getRefNum(), ptrFound.getCellRef().getMpNum());
bool isCurrentContainer = false; bool isCurrentContainer = false;
bool hasActorEquipment = ptrFound.getClass().isActor() && ptrFound.getClass().hasInventoryStore(ptrFound);
// If we are in a container, and it happens to be this container, keep track of that // If we are in a container, and it happens to be this container, keep track of that
if (MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Container)) if (MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Container))
@ -133,8 +134,8 @@ void WorldEvent::editContainers(MWWorld::CellStore* cellStore)
newPtr.getCellRef().setEnchantmentCharge(containerItem.enchantmentCharge); newPtr.getCellRef().setEnchantmentCharge(containerItem.enchantmentCharge);
containerStore.add(newPtr, containerItem.count, ownerPtr, true); containerStore.add(newPtr, containerItem.count, ownerPtr, true);
} }
else if (action == BaseEvent::REMOVE && containerItem.actionCount > 0) else if (action == BaseEvent::REMOVE && containerItem.actionCount > 0)
{ {
// We have to find the right item ourselves because ContainerStore has no method // We have to find the right item ourselves because ContainerStore has no method
@ -151,7 +152,7 @@ void WorldEvent::editContainers(MWWorld::CellStore* cellStore)
takeAllSound = itemPtr.getClass().getUpSoundId(itemPtr); takeAllSound = itemPtr.getClass().getUpSoundId(itemPtr);
// Is this an actor's container? If so, unequip this item if it was equipped // Is this an actor's container? If so, unequip this item if it was equipped
if (ptrFound.getClass().isActor() && ptrFound.getClass().hasInventoryStore(ptrFound)) if (hasActorEquipment)
{ {
MWWorld::InventoryStore& invStore = ptrFound.getClass().getInventoryStore(ptrFound); MWWorld::InventoryStore& invStore = ptrFound.getClass().getInventoryStore(ptrFound);
@ -170,7 +171,7 @@ void WorldEvent::editContainers(MWWorld::CellStore* cellStore)
isResolved = containerWindow->dragItemByPtr(itemPtr, containerItem.actionCount); isResolved = containerWindow->dragItemByPtr(itemPtr, containerItem.actionCount);
} }
} }
if (!isResolved) if (!isResolved)
{ {
containerStore.remove(itemPtr, containerItem.actionCount, ownerPtr); containerStore.remove(itemPtr, containerItem.actionCount, ownerPtr);
@ -190,7 +191,7 @@ void WorldEvent::editContainers(MWWorld::CellStore* cellStore)
// Was this a SET or ADD action on an actor's container, and are we the authority // Was this a SET or ADD action on an actor's container, and are we the authority
// over the actor? If so, autoequip the actor // over the actor? If so, autoequip the actor
if ((action == BaseEvent::ADD || action == BaseEvent::SET) && ptrFound.getClass().isActor() && if ((action == BaseEvent::ADD || action == BaseEvent::SET) && hasActorEquipment &&
mwmp::Main::get().getCellController()->isLocalActor(ptrFound)) mwmp::Main::get().getCellController()->isLocalActor(ptrFound))
{ {
MWWorld::InventoryStore& invStore = ptrFound.getClass().getInventoryStore(ptrFound); MWWorld::InventoryStore& invStore = ptrFound.getClass().getInventoryStore(ptrFound);