diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp index 85a570d8dd..492807eb93 100644 --- a/apps/opencs/model/doc/savingstages.cpp +++ b/apps/opencs/model/doc/savingstages.cpp @@ -291,8 +291,7 @@ int CSMDoc::WriteCellCollectionStage::setup() return mDocument.getData().getCells().getSize(); } -void CSMDoc::WriteCellCollectionStage::writeReferences( - const std::deque& references, bool interior, unsigned int& newRefNum) +void CSMDoc::WriteCellCollectionStage::writeReferences(const std::deque& references, bool interior) { ESM::ESMWriter& writer = mState.getWriter(); @@ -359,9 +358,6 @@ void CSMDoc::WriteCellCollectionStage::perform(int stage, Messages& messages) CSMWorld::Cell cellRecord = cell.get(); const bool interior = !cellRecord.mId.startsWith("#"); - // count new references and adjust RefNumCount accordingsly - unsigned int newRefNum = cellRecord.mRefNumCounter; - if (references != nullptr) { for (std::deque::const_iterator iter(references->begin()); iter != references->end(); ++iter) @@ -387,9 +383,6 @@ void CSMDoc::WriteCellCollectionStage::perform(int stage, Messages& messages) ESM::RefId::stringRefId(CSMWorld::CellCoordinates(refRecord.getCellIndex()).getId("")) != refRecord.mCell)) ++cellRecord.mRefNumCounter; - - if (refRecord.mRefNum.mIndex >= newRefNum) - newRefNum = refRecord.mRefNum.mIndex + 1; } } @@ -412,9 +405,9 @@ void CSMDoc::WriteCellCollectionStage::perform(int stage, Messages& messages) // write references if (references != nullptr) { - writeReferences(persistentRefs, interior, newRefNum); + writeReferences(persistentRefs, interior); cellRecord.saveTempMarker(writer, static_cast(references->size()) - persistentRefs.size()); - writeReferences(tempRefs, interior, newRefNum); + writeReferences(tempRefs, interior); } writer.endRecord(cellRecord.sRecordId); diff --git a/apps/opencs/model/doc/savingstages.hpp b/apps/opencs/model/doc/savingstages.hpp index 5423b8f504..1f86af10a2 100644 --- a/apps/opencs/model/doc/savingstages.hpp +++ b/apps/opencs/model/doc/savingstages.hpp @@ -167,7 +167,7 @@ namespace CSMDoc Document& mDocument; SavingState& mState; - void writeReferences(const std::deque& references, bool interior, unsigned int& newRefNum); + void writeReferences(const std::deque& references, bool interior); public: WriteCellCollectionStage(Document& document, SavingState& state);