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

Initialize with correct content file number instead of correcting at save stage.

Browse source
This commit is contained in:
Aesylwinn 2016-08-30 16:42:38 -04:00
parent 3ae2fc17c6
commit b2ddd3c259
3 changed files with 7 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -321,9 +321,9 @@ void CSMDoc::WriteCellCollectionStage::perform (int stage, Messages& messages)
{ {
CSMWorld::CellRef refRecord = ref.get(); CSMWorld::CellRef refRecord = ref.get();
// Correct content file number to be relative to plugin // Check for uninitialized content file
refRecord.mRefNum.mContentFile = mDocument.getData().getPluginContentFile( if (!refRecord.mRefNum.hasContentFile())
refRecord.mRefNum.mContentFile); refRecord.mRefNum.mContentFile = 0;
// recalculate the ref's cell location // recalculate the ref's cell location
std::ostringstream stream; std::ostringstream stream;

33
apps/opencs/model/world/data.cpp
View file

@ -64,7 +64,7 @@ int CSMWorld::Data::count (RecordBase::State state, const CollectionBase& collec
CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager, const Fallback::Map* fallback, const boost::filesystem::path& resDir) CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager, const Fallback::Map* fallback, const boost::filesystem::path& resDir)
: mEncoder (encoding), mPathgrids (mCells), mRefs (mCells), : mEncoder (encoding), mPathgrids (mCells), mRefs (mCells),
mResourcesManager (resourcesManager), mFallbackMap(fallback), mResourcesManager (resourcesManager), mFallbackMap(fallback),
mReader (0), mDialogue (0), mReaderIndex(0), mResourceSystem(new Resource::ResourceSystem(resourcesManager.getVFS())) mReader (0), mDialogue (0), mReaderIndex(1), mResourceSystem(new Resource::ResourceSystem(resourcesManager.getVFS()))
{ {
mResourceSystem->getSceneManager()->setShaderPath((resDir / "shaders").string()); mResourceSystem->getSceneManager()->setShaderPath((resDir / "shaders").string());
@ -899,7 +899,7 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
mReader = new ESM::ESMReader; mReader = new ESM::ESMReader;
mReader->setEncoder (&mEncoder); mReader->setEncoder (&mEncoder);
mReader->setIndex(mReaderIndex++); mReader->setIndex((project || !base) ? 0 : mReaderIndex++);
mReader->open (path.string()); mReader->open (path.string());
mContentFileNames.insert(std::make_pair(path.filename().string(), mReader->getIndex())); mContentFileNames.insert(std::make_pair(path.filename().string(), mReader->getIndex()));
@ -924,27 +924,12 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
if (nameResult != mContentFileNames.end()) if (nameResult != mContentFileNames.end())
{ {
ESM::Header::MasterData& hackedMasterData = const_cast<ESM::Header::MasterData&>(*masterData); ESM::Header::MasterData& hackedMasterData = const_cast<ESM::Header::MasterData&>(*masterData);
hackedMasterData.index = nameResult->second; hackedMasterData.index = nameResult->second;
} }
} }
// Needed for saving
if (!mBase)
{
mReverseContentFiles.insert(std::make_pair(mReader->getIndex(), 0));
}
if (mProject)
{
mReverseContentFiles.insert(std::make_pair(mReader->getIndex(), 0));
// A new project has no header, so extrapolate the content files from the reader index
// The base/project index of 0 will not be overwritten
for (int i = 0; i < mReader->getIndex(); ++i)
{
mReverseContentFiles.insert(std::make_pair(i, i+1));
}
}
return mReader->getRecordCount(); return mReader->getRecordCount();
} }
@ -1202,16 +1187,6 @@ int CSMWorld::Data::count (RecordBase::State state) const
count (state, mPathgrids); count (state, mPathgrids);
} }
int CSMWorld::Data::getPluginContentFile(int currentContentFile)
{
std::map<int, int>::iterator searchResult = mReverseContentFiles.find(currentContentFile);
if (searchResult != mReverseContentFiles.end())
return searchResult->second;
else
return 0; // Assume faulty plugin with original content
}
std::vector<std::string> CSMWorld::Data::getIds (bool listDeleted) const std::vector<std::string> CSMWorld::Data::getIds (bool listDeleted) const
{ {
std::vector<std::string> ids; std::vector<std::string> ids;

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

@ -124,8 +124,6 @@ namespace CSMWorld
std::vector<boost::shared_ptr<ESM::ESMReader> > mReaders; std::vector<boost::shared_ptr<ESM::ESMReader> > mReaders;
std::map<std::string, int> mContentFileNames; std::map<std::string, int> mContentFileNames;
// current index, plugin index
std::map<int, int> mReverseContentFiles;
// not implemented // not implemented
Data (const Data&); Data (const Data&);
@ -302,9 +300,6 @@ namespace CSMWorld
int count (RecordBase::State state) const; int count (RecordBase::State state) const;
///< Return number of top-level records with the given \a state. ///< Return number of top-level records with the given \a state.
/// Returns the content file number relative to the plugin being edited, 0 by default
int getPluginContentFile(int currentContentFile);
signals: signals:
void idListChanged(); void idListChanged();