mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 02:11:33 +00:00
Code Issues Releases Wiki Activity

Fix using incorrect id to search for record flags. Eliminate inefficient double-loop in saving cell references.

Browse source
This commit is contained in:
cc9cii 2021-06-30 10:46:51 +10:00
parent 47ef98ca1b
commit 2d8dd9be32
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
apps/opencs/model/doc/savingstages.cpp
View file

@ -253,12 +253,9 @@ int CSMDoc::WriteCellCollectionStage::setup()
return mDocument.getData().getCells().getSize(); return mDocument.getData().getCells().getSize();
} }
int CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& references, bool interior, unsigned int& newRefNum, bool temp) void CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& references, bool interior, unsigned int& newRefNum)
{ {
ESM::ESMWriter& writer = mState.getWriter(); ESM::ESMWriter& writer = mState.getWriter();
size_t refCount = 0;
const CSMWorld::RefIdCollection& referenceables = mDocument.getData().getReferenceables();
const CSMWorld::RefIdData& refIdData = referenceables.getDataSet();
for (std::deque<int>::const_iterator iter (references.begin()); for (std::deque<int>::const_iterator iter (references.begin());
iter!=references.end(); ++iter) iter!=references.end(); ++iter)
@ -266,14 +263,6 @@ int CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& re
const CSMWorld::Record<CSMWorld::CellRef>& ref = const CSMWorld::Record<CSMWorld::CellRef>& ref =
mDocument.getData().getReferences().getRecord (*iter); mDocument.getData().getReferences().getRecord (*iter);
unsigned int recordFlags = refIdData.getRecordFlags(ref.get().mId);
bool isPersistent = (recordFlags & 0x00000400) != 0;
if (temp && isPersistent || !temp && !isPersistent)
continue;
refCount++;
if (ref.isModified() || ref.mState == CSMWorld::RecordBase::State_Deleted) if (ref.isModified() || ref.mState == CSMWorld::RecordBase::State_Deleted)
{ {
CSMWorld::CellRef refRecord = ref.get(); CSMWorld::CellRef refRecord = ref.get();
@ -318,14 +307,17 @@ int CSMDoc::WriteCellCollectionStage::writeReferences (const std::deque<int>& re
refRecord.save (writer, false, false, ref.mState == CSMWorld::RecordBase::State_Deleted); refRecord.save (writer, false, false, ref.mState == CSMWorld::RecordBase::State_Deleted);
} }
} }
return refCount;
} }
void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages) void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
{ {
ESM::ESMWriter& writer = mState.getWriter(); ESM::ESMWriter& writer = mState.getWriter();
const CSMWorld::Record<CSMWorld::Cell>& cell = mDocument.getData().getCells().getRecord (stage); const CSMWorld::Record<CSMWorld::Cell>& cell = mDocument.getData().getCells().getRecord (stage);
const CSMWorld::RefIdCollection& referenceables = mDocument.getData().getReferenceables();
const CSMWorld::RefIdData& refIdData = referenceables.getDataSet();
std::deque<int> tempRefs;
std::deque<int> persistentRefs;
std::map<std::string, std::deque<int> >::const_iterator references = std::map<std::string, std::deque<int> >::const_iterator references =
mState.getSubRecords().find (Misc::StringUtils::lowerCase (cell.get().mId)); mState.getSubRecords().find (Misc::StringUtils::lowerCase (cell.get().mId));
@ -350,6 +342,14 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
CSMWorld::CellRef refRecord = ref.get(); CSMWorld::CellRef refRecord = ref.get();
unsigned int recordFlags = refIdData.getRecordFlags(refRecord.mRefID);
bool isPersistent = (recordFlags & 0x00000400) != 0;
if (isPersistent)
persistentRefs.push_back(*iter);
else
tempRefs.push_back(*iter);
if (refRecord.mNew || if (refRecord.mNew ||
(!interior && ref.mState==CSMWorld::RecordBase::State_ModifiedOnly && (!interior && ref.mState==CSMWorld::RecordBase::State_ModifiedOnly &&
/// \todo consider worldspace /// \todo consider worldspace
@ -380,10 +380,9 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
// write references // write references
if (references!=mState.getSubRecords().end()) if (references!=mState.getSubRecords().end())
{ {
int persistentRefCount = writeReferences(references->second, interior, newRefNum, false/*temp*/); writeReferences(persistentRefs, interior, newRefNum);
cellRecord.saveTempMarker(writer, int(references->second.size()) - persistentRefCount); cellRecord.saveTempMarker(writer, int(references->second.size()) - persistentRefs.size());
// FIXME: loops twice, inefficient writeReferences(tempRefs, interior, newRefNum);
writeReferences(references->second, interior, newRefNum, true/*temp*/);
} }
writer.endRecord (cellRecord.sRecordId); writer.endRecord (cellRecord.sRecordId);

2
apps/opencs/model/doc/savingstages.hpp
View file

@ -171,7 +171,7 @@ namespace CSMDoc
Document& mDocument; Document& mDocument;
SavingState& mState; SavingState& mState;
int writeReferences (const std::deque<int>& references, bool interior, unsigned int& newRefNum, bool temp); void writeReferences (const std::deque<int>& references, bool interior, unsigned int& newRefNum);
public: public: