simplifying CSMWorld::CellRef

pull/16/head
Marc Zinnschlag 12 years ago
parent 744198fc44
commit 97f421df8a

@ -3,12 +3,15 @@
#include "cell.hpp"
void CSMWorld::CellRef::load (ESM::ESMReader &esm, Cell& cell, const std::string& id)
void CSMWorld::CellRef::load (ESM::ESMReader &esm)
{
mId = id;
// The CellRef is not loaded here. Because of the unfortunate way how the ESMReader and the cell
// record is constructed, we do not have enough context in this function to perform a load.
cell.getNextRef (esm, *this);
// mId = id;
if (!mDeleted)
cell.addRef (mId);
}
// cell.getNextRef (esm, *this);
// if (!mDeleted)
// cell.addRef (mId);
}

@ -17,8 +17,7 @@ namespace CSMWorld
{
std::string mId;
void load (ESM::ESMReader &esm, Cell& cell, const std::string& id);
///< Load cell ref and register it with \a cell.
void load (ESM::ESMReader &esm);
};
}

Loading…
Cancel
Save