mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 11:09:41 +00:00
Code Issues Releases Wiki Activity

Use male bodyparts as fallback for females in the editor

Browse source
This commit is contained in:
Andrei Kortunov 2018-09-27 13:14:34 +04:00
parent 7eb1b14b21
commit ac848b0902
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/opencs/model/world/actoradapter.cpp
View file

@ -110,11 +110,19 @@ namespace CSMWorld
return SceneUtil::getActorSkeleton(firstPerson, mFemale, beast, werewolf); return SceneUtil::getActorSkeleton(firstPerson, mFemale, beast, werewolf);
} }
const std::string& ActorAdapter::ActorData::getPart(ESM::PartReferenceType index) const const std::string ActorAdapter::ActorData::getPart(ESM::PartReferenceType index) const
{ {
if (mParts[index].empty() && mRaceData && mRaceData->handlesPart(index)) if (mParts[index].empty() && mRaceData && mRaceData->handlesPart(index))
{ {
return mFemale ? mRaceData->getFemalePart(index) : mRaceData->getMalePart(index); if (mFemale)
{
// Note: we should use male parts for females as fallback
const std::string femalePart = mRaceData->getFemalePart(index);
if (!femalePart.empty())
return femalePart;
}
return mRaceData->getMalePart(index);
} }
return mParts[index]; return mParts[index];
} }

2
apps/opencs/model/world/actoradapter.hpp
View file

@ -88,7 +88,7 @@ namespace CSMWorld
/// Returns the skeleton the actor should use for attaching parts to /// Returns the skeleton the actor should use for attaching parts to
std::string getSkeleton() const; std::string getSkeleton() const;
/// Retrieves the associated actor part /// Retrieves the associated actor part
const std::string& getPart(ESM::PartReferenceType index) const; const std::string getPart(ESM::PartReferenceType index) const;
/// Checks if the actor has a data dependency /// Checks if the actor has a data dependency
bool hasDependency(const std::string& id) const; bool hasDependency(const std::string& id) const;