mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-06 16:45:32 +00:00
Code Issues Releases Wiki Activity

Convert RefNum index map to use find().

Browse source
This commit is contained in:
cc9cii 2015-12-06 21:19:06 +11:00
parent a967418a5a
commit 68e16b6cee
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/model/world/data.hpp
View file

@ -104,7 +104,7 @@ namespace CSMWorld
const ESM::Dialogue *mDialogue; // last loaded dialogue const ESM::Dialogue *mDialogue; // last loaded dialogue
bool mBase; bool mBase;
bool mProject; bool mProject;
std::map<std::string, std::map<ESM::RefNum, std::string> > mRefLoadCache; std::map<std::string, std::map<unsigned int, std::string> > mRefLoadCache;
int mReaderIndex; int mReaderIndex;
std::vector<boost::shared_ptr<ESM::ESMReader> > mReaders; std::vector<boost::shared_ptr<ESM::ESMReader> > mReaders;

15
apps/opencs/model/world/refcollection.cpp
View file

@ -12,7 +12,7 @@
#include "record.hpp" #include "record.hpp"
void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool base, void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool base,
std::map<ESM::RefNum, std::string>& cache, CSMDoc::Messages& messages) std::map<unsigned int, std::string>& cache, CSMDoc::Messages& messages)
{ {
Record<Cell> cell = mCells.getRecord (cellIndex); Record<Cell> cell = mCells.getRecord (cellIndex);
@ -71,13 +71,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
else else
ref.mCell = cell2.mId; ref.mCell = cell2.mId;
// ignore content file number std::map<unsigned int, std::string>::iterator iter = cache.find (ref.mRefNum.mIndex);
std::map<ESM::RefNum, std::string>::iterator iter = cache.begin();
for (; iter != cache.end(); ++iter)
{
if (ref.mRefNum.mIndex == iter->first.mIndex)
break;
}
if (isDeleted) if (isDeleted)
{ {
@ -114,11 +108,12 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
std::unique_ptr<Record<CellRef> > record(new Record<CellRef>); std::unique_ptr<Record<CellRef> > record(new Record<CellRef>);
record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly; record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
cache.insert (std::make_pair (ref.mRefNum.mIndex, ref.mId));
(base ? record->mBase : record->mModified) = std::move(ref); (base ? record->mBase : record->mModified) = std::move(ref);
appendRecord(std::move(record)); appendRecord(std::move(record));
cache.insert (std::make_pair (ref.mRefNum, ref.mId));
} }
else else
{ {

2
apps/opencs/model/world/refcollection.hpp
View file

@ -27,7 +27,7 @@ namespace CSMWorld
{} {}
void load (ESM::ESMReader& reader, int cellIndex, bool base, void load (ESM::ESMReader& reader, int cellIndex, bool base,
std::map<ESM::RefNum, std::string>& cache, CSMDoc::Messages& messages); std::map<unsigned int, std::string>& cache, CSMDoc::Messages& messages);
///< Load a sequence of references. ///< Load a sequence of references.
std::string getNewId(); std::string getNewId();