[Client] Include NPC/creature containers when adding all cell containers

0.6.3
David Cernat 7 years ago
parent 1e3c4fd488
commit 26a56d6a02

@ -717,23 +717,22 @@ void WorldEvent::playVideo()
void WorldEvent::addAllContainers(MWWorld::CellStore* cellStore)
{
MWWorld::CellRefList<ESM::Container> *containerList = cellStore->getContainers();
for (auto &container : containerList->mList)
for (auto &ref : cellStore->getContainers()->mList)
{
mwmp::WorldObject worldObject;
worldObject.refId = container.mRef.getRefId();
worldObject.refNumIndex = container.mRef.getRefNum().mIndex;
worldObject.mpNum = container.mRef.getMpNum();
MWWorld::ContainerStore& containerStore = container.mClass->getContainerStore(MWWorld::Ptr(&container, 0));
MWWorld::Ptr ptr(&ref, 0);
addEntireContainer(ptr);
}
for (const auto itemPtr : containerStore)
for (auto &ref : cellStore->getNpcs()->mList)
{
addContainerItem(worldObject, itemPtr, 0);
MWWorld::Ptr ptr(&ref, 0);
addEntireContainer(ptr);
}
addObject(worldObject);
for (auto &ref : cellStore->getCreatures()->mList)
{
MWWorld::Ptr ptr(&ref, 0);
addEntireContainer(ptr);
}
}

Loading…
Cancel
Save