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

[Client] Also include list of creatures in reply to ActorList

Browse source
This commit is contained in:
David Cernat 2017-04-05 06:22:01 +03:00
parent ca92be14a5
commit bb9ea6ccd4
3 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,12 +51,27 @@ void WorldEvent::sendActors(MWWorld::CellStore* cellStore)
for (typename MWWorld::CellRefList<ESM::NPC>::List::iterator listIter(npcList->mList.begin()); for (typename MWWorld::CellRefList<ESM::NPC>::List::iterator listIter(npcList->mList.begin());
listIter != npcList->mList.end(); ++listIter) listIter != npcList->mList.end(); ++listIter)
{ {
MWWorld::Ptr npc(&*listIter, 0); MWWorld::Ptr ptr(&*listIter, 0);
mwmp::WorldObject worldObject; mwmp::WorldObject worldObject;
worldObject.refId = npc.getCellRef().getRefId(); worldObject.refId = ptr.getCellRef().getRefId();
worldObject.refNumIndex = npc.getCellRef().getRefNum().mIndex; worldObject.refNumIndex = ptr.getCellRef().getRefNum().mIndex;
worldObject.mpNum = npc.getCellRef().getMpNum(); worldObject.mpNum = ptr.getCellRef().getMpNum();
worldEvent->addObject(worldObject);
}
MWWorld::CellRefList<ESM::Creature> *creatureList = cellStore->getCreatures();
for (typename MWWorld::CellRefList<ESM::Creature>::List::iterator listIter(creatureList->mList.begin());
listIter != creatureList->mList.end(); ++listIter)
{
MWWorld::Ptr ptr(&*listIter, 0);
mwmp::WorldObject worldObject;
worldObject.refId = ptr.getCellRef().getRefId();
worldObject.refNumIndex = ptr.getCellRef().getRefNum().mIndex;
worldObject.mpNum = ptr.getCellRef().getMpNum();
worldEvent->addObject(worldObject); worldEvent->addObject(worldObject);
} }

6
apps/openmw/mwworld/cellstore.cpp
View file

@ -487,6 +487,12 @@ namespace MWWorld
return &mNpcs; return &mNpcs;
} }
// Added by tes3mp and used to get all the creatures in the cell
CellRefList<ESM::Creature> *CellStore::getCreatures()
{
return &mCreatures;
}
// Added by tes3mp and used to get all the containers in the cell // Added by tes3mp and used to get all the containers in the cell
CellRefList<ESM::Container> *CellStore::getContainers() CellRefList<ESM::Container> *CellStore::getContainers()
{ {

3
apps/openmw/mwworld/cellstore.hpp
View file

@ -240,6 +240,9 @@ namespace MWWorld
CellRefList<ESM::NPC> *getNpcs(); CellRefList<ESM::NPC> *getNpcs();
// Added by tes3mp and used to get all the NPCs in the cell // Added by tes3mp and used to get all the NPCs in the cell
CellRefList<ESM::Creature> *getCreatures();
// Added by tes3mp and used to get all the creatures in the cell
CellRefList<ESM::Container> *getContainers(); CellRefList<ESM::Container> *getContainers();
// Added by tes3mp and used to get all the containers in the cell // Added by tes3mp and used to get all the containers in the cell