mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-24 09:39:51 +00:00
Code Issues Projects Releases Wiki Activity

Revert "simplifying CSMWorld::CellRef"

Browse Source 
With the refactored collection class we can now handle the more complex load function

This reverts commit 97f421df8a5a3f6e4803001af8014355128d8523.
This commit is contained in:
Marc Zinnschlag 2013-06-18 11:27:05 +02:00
parent 5b3d2f5da1
commit 94ec05c2c6
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/opencs/model/world/ref.cpp
View File

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

3
apps/opencs/model/world/ref.hpp
View File

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