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

[Client] Update ActorList to C++11

Browse source
This commit is contained in:
Koncord 2017-06-27 21:56:14 +08:00
parent aa12b35d03
commit 7918e887dd
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwmp/ActorList.cpp
View file

@ -174,12 +174,9 @@ void ActorList::sendActorsInCell(MWWorld::CellStore* cellStore)
cell = *cellStore->getCell();
action = BaseActorList::SET;
MWWorld::CellRefList<ESM::NPC> *npcList = cellStore->getNpcs();
for (typename MWWorld::CellRefList<ESM::NPC>::List::iterator listIter(npcList->mList.begin());
listIter != npcList->mList.end(); ++listIter)
for(auto &ref : cellStore->getNpcs()->mList)
{
MWWorld::Ptr ptr(&*listIter, 0);
MWWorld::Ptr ptr(&ref, 0);
// If this Ptr is lacking a unique index, ignore it
if (ptr.getCellRef().getRefNum().mIndex == 0 && ptr.getCellRef().getMpNum() == 0) continue;
@ -192,12 +189,9 @@ void ActorList::sendActorsInCell(MWWorld::CellStore* cellStore)
addActor(actor);
}
MWWorld::CellRefList<ESM::Creature> *creatureList = cellStore->getCreatures();
for (typename MWWorld::CellRefList<ESM::Creature>::List::iterator listIter(creatureList->mList.begin());
listIter != creatureList->mList.end(); ++listIter)
for(auto &ref : cellStore->getCreatures()->mList)
{
MWWorld::Ptr ptr(&*listIter, 0);
MWWorld::Ptr ptr(&ref, 0);
// If this Ptr is lacking a unique index, ignore it
if (ptr.getCellRef().getRefNum().mIndex == 0 && ptr.getCellRef().getMpNum() == 0) continue;