@ -3,22 +3,8 @@
namespace MWWorld { namespace MWWorld {
void Store < ESM : : Cell > : : handleMovedCellRefs ( ESM : : ESMReader & esm , ESM : : Cell * cell )
void Store < ESM : : Cell > : : load ( ESM : : ESMReader & esm , const std : : string & id )
{ {
// Don't automatically assume that a new cell must be spawned. Multiple plugins write to the same cell,
// and we merge all this data into one Cell object. However, we can't simply search for the cell id,
// as many exterior cells do not have a name. Instead, we need to search by (x,y) coordinates - and they
// are not available until both cells have been loaded! So first, proceed as usual.
// All cells have a name record, even nameless exterior cells.
std : : string idLower = Misc : : StringUtils : : lowerCase ( id ) ;
ESM : : Cell * cell = new ESM : : Cell ;
cell - > mName = id ;
//First part of cell loading
cell - > preLoad ( esm ) ;
//Handling MovedCellRefs, there is no way to do it inside loadcell
//Handling MovedCellRefs, there is no way to do it inside loadcell
while ( esm . isNextSub ( " MVRF " ) ) {
while ( esm . isNextSub ( " MVRF " ) ) {
ESM : : CellRef ref ;
ESM : : CellRef ref ;
@ -43,35 +29,56 @@ void Store<ESM::Cell>::load(ESM::ESMReader &esm, const std::string &id)
else
else
* iter = ref ;
* iter = ref ;
}
}
}
void Store < ESM : : Cell > : : load ( ESM : : ESMReader & esm , const std : : string & id )
{
// Don't automatically assume that a new cell must be spawned. Multiple plugins write to the same cell,
// and we merge all this data into one Cell object. However, we can't simply search for the cell id,
// as many exterior cells do not have a name. Instead, we need to search by (x,y) coordinates - and they
// are not available until both cells have been loaded at least partially!
// All cells have a name record, even nameless exterior cells.
std : : string idLower = Misc : : StringUtils : : lowerCase ( id ) ;
ESM : : Cell cell ;
cell . mName = id ;
//Second part of cell loading
// Load the (x,y) coordinates of the cell, if it is an exterior cell,
cell - > postLoad ( esm ) ;
// so we can find the cell we need to merge with
cell . loadData ( esm ) ;
if ( cell - > mData . mFlags & ESM : : Cell : : Interior )
if ( cell . mData . mFlags & ESM : : Cell : : Interior )
{
{
// Store interior cell by name, try to merge with existing parent data.
// Store interior cell by name, try to merge with existing parent data.
ESM : : Cell * oldcell = const_cast < ESM : : Cell * > ( search ( idLower ) ) ;
ESM : : Cell * oldcell = const_cast < ESM : : Cell * > ( search ( idLower ) ) ;
if ( oldcell ) {
if ( oldcell ) {
// push the new references on the list of references to manage
// merge new cell into old cell
oldcell - > mContextList . push_back ( cell - > mContextList . at ( 0 ) ) ;
// push the new references on the list of references to manage (saveContext = true)
// copy list into new cell
oldcell - > mData = cell . mData ;
cell - > mContextList = oldcell - > mContextList ;
oldcell - > loadCell ( esm , true ) ;
// have new cell replace old cell
ESM : : Cell : : merge ( oldcell , cell ) ;
} else
} else
mInt [ idLower ] = * cell ;
{
// spawn a new cell
cell . loadCell ( esm , true ) ;
mInt [ idLower ] = cell ;
}
}
}
else
else
{
{
// Store exterior cells by grid position, try to merge with existing parent data.
// Store exterior cells by grid position, try to merge with existing parent data.
ESM : : Cell * oldcell = const_cast < ESM : : Cell * > ( search ( cell - > getGridX ( ) , cell - > getGridY ( ) ) ) ;
ESM : : Cell * oldcell = const_cast < ESM : : Cell * > ( search ( cell . getGridX ( ) , cell . getGridY ( ) ) ) ;
if ( oldcell ) {
if ( oldcell ) {
// push the new references on the list of references to manage
// merge new cell into old cell
oldcell - > mContextList . push_back ( cell - > mContextList . at ( 0 ) ) ;
// push the new references on the list of references to manage (saveContext = true)
// copy list into new cell
oldcell - > mData = cell . mData ;
cell - > mContextList = oldcell - > mContextList ;
oldcell - > loadCell ( esm , true ) ;
// handle moved ref (MVRF) subrecords
handleMovedCellRefs ( esm , & cell ) ;
// merge lists of leased references, use newer data in case of conflict
// merge lists of leased references, use newer data in case of conflict
for ( ESM : : MovedCellRefTracker : : const_iterator it = cell - > mMovedRefs . begin ( ) ; it ! = cell - > mMovedRefs . end ( ) ; + + it ) {
for ( ESM : : MovedCellRefTracker : : const_iterator it = cell . mMovedRefs . begin ( ) ; it ! = cell . mMovedRefs . end ( ) ; + + it ) {
// remove reference from current leased ref tracker and add it to new cell
// remove reference from current leased ref tracker and add it to new cell
ESM : : MovedCellRefTracker : : iterator itold = std : : find ( oldcell - > mMovedRefs . begin ( ) , oldcell - > mMovedRefs . end ( ) , it - > mRefNum ) ;
ESM : : MovedCellRefTracker : : iterator itold = std : : find ( oldcell - > mMovedRefs . begin ( ) , oldcell - > mMovedRefs . end ( ) , it - > mRefNum ) ;
if ( itold ! = oldcell - > mMovedRefs . end ( ) ) {
if ( itold ! = oldcell - > mMovedRefs . end ( ) ) {
@ -82,13 +89,21 @@ void Store<ESM::Cell>::load(ESM::ESMReader &esm, const std::string &id)
* itold = * it ;
* itold = * it ;
}
}
}
}
cell - > mMovedRefs = oldcell - > mMovedRefs ;
// have new cell replace old cell
// We don't need to merge mLeasedRefs of cell / oldcell. This list is filled when another cell moves a
ESM : : Cell : : merge ( oldcell , cell ) ;
// reference to this cell, so the list for the new cell should be empty. The list for oldcell,
// however, could have leased refs in it and so should be kept.
} else
} else
mExt [ std : : make_pair ( cell - > mData . mX , cell - > mData . mY ) ] = * cell ;
{
// spawn a new cell
cell . loadCell ( esm , true ) ;
// handle moved ref (MVRF) subrecords
handleMovedCellRefs ( esm , & cell ) ;
mExt [ std : : make_pair ( cell . mData . mX , cell . mData . mY ) ] = cell ;
}
}
}
delete cell ;
} }
} }
scrawl
11 years ago