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

Merge pull request #2029 from akortunov/actorfix

Browse Source 
[Regression] Handle case in the editor when actor's bodypart was not found
This commit is contained in:
Bret Curtis 2018-11-12 11:44:28 +01:00 committed by GitHub
commit 194232abde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/opencs/model/world/actoradapter.cpp
View File

@ -113,7 +113,9 @@ namespace CSMWorld
const std::string ActorAdapter::ActorData::getPart(ESM::PartReferenceType index) const const std::string ActorAdapter::ActorData::getPart(ESM::PartReferenceType index) const
{ {
auto it = mParts.find(index); auto it = mParts.find(index);
if (it == mParts.end() && mRaceData && mRaceData->handlesPart(index)) if (it == mParts.end())
{
if (mRaceData && mRaceData->handlesPart(index))
{ {
if (mFemale) if (mFemale)
{ {
@ -126,6 +128,9 @@ namespace CSMWorld
return mRaceData->getMalePart(index); return mRaceData->getMalePart(index);
} }
return "";
}
const std::string& partName = it->second.first; const std::string& partName = it->second.first;
return partName; return partName;
} }