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

Merge remote-tracking branch 'scrawl/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2013-04-14 19:45:33 +02:00
commit 615ce0b199
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwworld/cells.cpp
View file

@ -165,6 +165,7 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name, Ptr::CellStore& ce
else else
return Ptr(); return Ptr();
} }
MWWorld::Ptr ptr; MWWorld::Ptr ptr;
if (MWWorld::LiveCellRef<ESM::Activator> *ref = cell.mActivators.find (name)) if (MWWorld::LiveCellRef<ESM::Activator> *ref = cell.mActivators.find (name))
@ -246,16 +247,16 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
} }
// Then check cells that are already listed // Then check cells that are already listed
for (std::map<std::string, Ptr::CellStore>::iterator iter = mInteriors.begin(); for (std::map<std::pair<int, int>, Ptr::CellStore>::iterator iter = mExteriors.begin();
iter!=mInteriors.end(); ++iter) iter!=mExteriors.end(); ++iter)
{ {
Ptr ptr = getPtrAndCache (name, iter->second); Ptr ptr = getPtrAndCache (name, iter->second);
if (!ptr.isEmpty()) if (!ptr.isEmpty())
return ptr; return ptr;
} }
for (std::map<std::pair<int, int>, Ptr::CellStore>::iterator iter = mExteriors.begin(); for (std::map<std::string, Ptr::CellStore>::iterator iter = mInteriors.begin();
iter!=mExteriors.end(); ++iter) iter!=mInteriors.end(); ++iter)
{ {
Ptr ptr = getPtrAndCache (name, iter->second); Ptr ptr = getPtrAndCache (name, iter->second);
if (!ptr.isEmpty()) if (!ptr.isEmpty())
@ -266,7 +267,7 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
const MWWorld::Store<ESM::Cell> &cells = mStore.get<ESM::Cell>(); const MWWorld::Store<ESM::Cell> &cells = mStore.get<ESM::Cell>();
MWWorld::Store<ESM::Cell>::iterator iter; MWWorld::Store<ESM::Cell>::iterator iter;
for (iter = cells.intBegin(); iter != cells.intEnd(); ++iter) for (iter = cells.extBegin(); iter != cells.extEnd(); ++iter)
{ {
Ptr::CellStore *cellStore = getCellStore (&(*iter)); Ptr::CellStore *cellStore = getCellStore (&(*iter));
@ -276,7 +277,7 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
return ptr; return ptr;
} }
for (iter = cells.extBegin(); iter != cells.extEnd(); ++iter) for (iter = cells.intBegin(); iter != cells.intEnd(); ++iter)
{ {
Ptr::CellStore *cellStore = getCellStore (&(*iter)); Ptr::CellStore *cellStore = getCellStore (&(*iter));