mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-04 00:26:39 +00:00
Code Issues Releases Wiki Activity

handle missing land texture records properly during merge

Browse source 
(cherry picked from commit 09ec60fe2a)
This commit is contained in:
Marc Zinnschlag 2015-09-08 16:01:34 +02:00 committed by cc9cii
parent 1784701b47
commit dcf1f1515a
1 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
apps/opencs/model/tools/mergestages.cpp
View file

@ -164,35 +164,42 @@ void CSMTools::MergeLandTexturesStage::perform (int stage, CSMDoc::Messages& mes
if (stage==0)
mNext = mState.mTextureIndices.begin();
if (mNext==mState.mTextureIndices.end())
return;
bool found = false;
mNext->second = stage;
std::ostringstream stream;
stream << mNext->first.first << "_" << mNext->first.second;
int index = mState.mSource.getData().getLandTextures().searchId (stream.str());
if (index!=-1)
do
{
CSMWorld::LandTexture texture =
mState.mSource.getData().getLandTextures().getRecord (index).get();
if (mNext==mState.mTextureIndices.end())
return;
mNext->second = stage;
std::ostringstream stream;
stream << mNext->second << "_0";
stream << mNext->first.first << "_" << mNext->first.second;
texture.mIndex = mNext->second;
texture.mId = stream.str();
int index = mState.mSource.getData().getLandTextures().searchId (stream.str());
CSMWorld::Record<CSMWorld::LandTexture> newRecord (
CSMWorld::RecordBase::State_ModifiedOnly, 0, &texture);
if (index!=-1)
{
CSMWorld::LandTexture texture =
mState.mSource.getData().getLandTextures().getRecord (index).get();
mState.mTarget->getData().getLandTextures().appendRecord (newRecord);
std::ostringstream stream;
stream << mNext->second << "_0";
texture.mIndex = mNext->second;
texture.mId = stream.str();
CSMWorld::Record<CSMWorld::LandTexture> newRecord (
CSMWorld::RecordBase::State_ModifiedOnly, 0, &texture);
mState.mTarget->getData().getLandTextures().appendRecord (newRecord);
found = true;
}
++mNext;
}
/// \todo deal with missing textures (either abort merge or report and make sure OpenMW can deal with missing textures)
++mNext;
while (!found);
}