mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-13 21:40:11 +00:00
Code Issues Projects Releases Wiki Activity

Issue #28: added load-state for cells

Browse Source
This commit is contained in:
Marc Zinnschlag 2011-09-22 11:48:04 +02:00
parent ce7202a147
commit e4a2f5547b
1 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
components/esm_store/cell_store.hpp
View File

@ -13,8 +13,10 @@
#include "store.hpp" #include "store.hpp"
#include "components/esm/records.hpp" #include "components/esm/records.hpp"
#include "components/esm/loadcell.hpp" #include "components/esm/loadcell.hpp"
#include <list>
#include <list>
#include <string>
#include <vector>
#include <iostream> #include <iostream>
#include <stdexcept> #include <stdexcept>
#include <algorithm> #include <algorithm>
@ -82,9 +84,16 @@ namespace ESMS
{ {
public: public:
CellStore (const ESM::Cell *cell_) : cell (cell_) {} enum State
{
State_Unloaded, State_Preloaded, State_Loaded
};
CellStore (const ESM::Cell *cell_) : cell (cell_), mState (State_Unloaded) {}
const ESM::Cell *cell; const ESM::Cell *cell;
State mState;
std::vector<std::string> mIds;
// Lists for each individual object type // Lists for each individual object type
CellRefList<Activator, D> activators; CellRefList<Activator, D> activators;
@ -110,9 +119,27 @@ namespace ESMS
void load (const ESMStore &store, ESMReader &esm) void load (const ESMStore &store, ESMReader &esm)
{ {
std::cout << "loading cell " << cell->getDescription() << std::endl; if (mState!=State_Loaded)
{
if (mState==State_Preloaded)
mIds.clear();
loadRefs (store, esm); std::cout << "loading cell " << cell->getDescription() << std::endl;
loadRefs (store, esm);
mState = State_Loaded;
}
}
void preload (const ESMStore &store, ESMReader &esm)
{
if (mState==State_Unloaded)
{
listRefs (store, esm);
mState = State_Preloaded;
}
} }
/// Call functor (ref) for each reference. functor must return a bool. Returning /// Call functor (ref) for each reference. functor must return a bool. Returning
@ -157,6 +184,30 @@ namespace ESMS
return true; return true;
} }
/// Run through references and store IDs
void listRefs(const ESMStore &store, ESMReader &esm)
{
assert (cell);
// Reopen the ESM reader and seek to the right position.
cell->restore (esm);
CellRef ref;
// Get each reference in turn
while (cell->getNextRef (esm, ref))
{
std::string lowerCase;
std::transform (ref.refID.begin(), ref.refID.end(), std::back_inserter (lowerCase),
(int(*)(int)) std::tolower);
mIds.push_back (ref.refID);
}
std::sort (mIds.begin(), mIds.end());
}
void loadRefs(const ESMStore &store, ESMReader &esm) void loadRefs(const ESMStore &store, ESMReader &esm)
{ {
assert (cell); assert (cell);