mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 08:23:51 +00:00
Code Issues Releases Wiki Activity

changed implementation functions for container serialisation from free functions to member functions (will need some polymorphism later)

Browse source
This commit is contained in:
Marc Zinnschlag 2014-02-01 15:24:01 +01:00
parent dd674566a2
commit bcc5894e2d
2 changed files with 46 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
apps/openmw/mwworld/containerstore.cpp
View file

@ -57,42 +57,43 @@ namespace
return MWWorld::Ptr(); return MWWorld::Ptr();
} }
}
template<typename T> template<typename T>
void getState (MWWorld::CellRefList<T>& collection, const ESM::ObjectState& state) void MWWorld::ContainerStore::getState (CellRefList<T>& collection, const ESM::ObjectState& state)
{
if (!LiveCellRef<T>::checkState (state))
return; // not valid anymore with current content files -> skip
const T *record = MWBase::Environment::get().getWorld()->getStore().
get<T>().search (state.mRef.mRefID);
if (!record)
return;
LiveCellRef<T> ref (record);
ref.load (state);
ref.mRef.mRefNum.mContentFile = -1;
collection.mList.push_back (ref);
}
template<typename T>
void MWWorld::ContainerStore::storeState (const LiveCellRef<T>& ref, ESM::ObjectState& state)
const
{
ref.save (state);
}
template<typename T>
void MWWorld::ContainerStore::storeStates (const CellRefList<T>& collection,
std::vector<std::pair<ESM::ObjectState, std::pair<unsigned int, int> > >& states) const
{
for (typename CellRefList<T>::List::const_iterator iter (collection.mList.begin());
iter!=collection.mList.end(); ++iter)
{ {
if (!MWWorld::LiveCellRef<T>::checkState (state)) ESM::ObjectState state;
return; // not valid anymore with current content files -> skip storeState (*iter, state);
states.push_back (std::make_pair (state, std::make_pair (T::sRecordId, -1)));
const T *record = MWBase::Environment::get().getWorld()->getStore().
get<T>().search (state.mRef.mRefID);
if (!record)
return;
MWWorld::LiveCellRef<T> ref (record);
ref.load (state);
ref.mRef.mRefNum.mContentFile = -1;
collection.mList.push_back (ref);
}
template<typename T>
void storeState (const MWWorld::LiveCellRef<T>& ref, ESM::ObjectState& state)
{
ref.save (state);
}
template<typename T>
void storeStates (const MWWorld::CellRefList<T>& collection,
std::vector<std::pair<ESM::ObjectState, std::pair<unsigned int, int> > >& states)
{
for (typename MWWorld::CellRefList<T>::List::const_iterator iter (collection.mList.begin());
iter!=collection.mList.end(); ++iter)
{
ESM::ObjectState state;
storeState (*iter, state);
states.push_back (std::make_pair (state, std::make_pair (T::sRecordId, -1)));
}
} }
} }

11
apps/openmw/mwworld/containerstore.hpp
View file

@ -57,6 +57,17 @@ namespace MWWorld
ContainerStoreIterator addImp (const Ptr& ptr, int count); ContainerStoreIterator addImp (const Ptr& ptr, int count);
void addInitialItem (const std::string& id, const std::string& owner, const std::string& faction, int count, bool topLevel=true); void addInitialItem (const std::string& id, const std::string& owner, const std::string& faction, int count, bool topLevel=true);
template<typename T>
void getState (CellRefList<T>& collection, const ESM::ObjectState& state);
template<typename T>
void storeState (const LiveCellRef<T>& ref, ESM::ObjectState& state) const;
template<typename T>
void storeStates (const CellRefList<T>& collection,
std::vector<std::pair<ESM::ObjectState, std::pair<unsigned int, int> > >& states)
const;
public: public:
ContainerStore(); ContainerStore();