mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 22:20:33 +00:00
Code Issues Projects Releases Wiki Activity

Convert RefNum index map to use find().

Browse Source 
(copied the changes from commits 68e16b6cee0f533027e1d8f1293b8a5582ac5a68 and 0de223c637d0820a97417d84796c1bfeb1836fb8)

NOTE: it is unclear how this change affects commit 61a4a0807b4ed2398b8169b477132b12a1a3a106
This commit is contained in:
cc9cii 2021-07-23 15:30:33 +10:00
parent be45092e55
commit 66bda84240
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,7 @@ namespace CSMWorld
const ESM::Dialogue *mDialogue; // last loaded dialogue
bool mBase;
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;
bool mFsStrict;

22
apps/opencs/model/world/refcollection.cpp
View File

@ -8,7 +8,7 @@
#include "record.hpp"
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);
@ -60,16 +60,12 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
else
ref.mCell = cell2.mId;
// ignore content file number
std::map<ESM::RefNum, std::string>::iterator iter = cache.begin();
unsigned int thisIndex = ref.mRefNum.mIndex & 0x00ffffff;
if (ref.mRefNum.mContentFile != -1 && !base) ref.mRefNum.mContentFile = ref.mRefNum.mIndex >> 24;
unsigned int refNum = (ref.mRefNum.mIndex & 0x00ffffff) |
(ref.mRefNum.hasContentFile() ? ref.mRefNum.mContentFile : 0xff) << 24;
for (; iter != cache.end(); ++iter)
{
if (thisIndex == iter->first.mIndex)
break;
}
std::map<unsigned int, std::string>::iterator iter = cache.find(refNum);
if (ref.mRefNum.mContentFile != -1 && !base) ref.mRefNum.mContentFile = ref.mRefNum.mIndex >> 24;
if (isDeleted)
{
@ -104,15 +100,13 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
// new reference
ref.mId = getNewId();
cache.emplace(refNum, ref.mId);
std::unique_ptr<Record<CellRef> > record(new Record<CellRef>);
record->mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
const ESM::RefNum refNum = ref.mRefNum;
std::string refId = ref.mId;
(base ? record->mBase : record->mModified) = std::move(ref);
appendRecord(std::move(record));
cache.emplace(refNum, std::move(refId));
}
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,
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.
std::string getNewId();