mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 10:53:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2152 from akortunov/headfix

Browse source 
[0.45 regression] Editor: hide hairs when helmet is used
This commit is contained in:
Bret Curtis 2019-02-05 15:36:34 +01:00 committed by GitHub
commit ffa3596fe4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -530,6 +530,10 @@ namespace CSMWorld
RaceDataPtr raceData = getRaceData(npc.mRace); RaceDataPtr raceData = getRaceData(npc.mRace);
data->reset_data(id, "", false, !npc.isMale(), raceData); data->reset_data(id, "", false, !npc.isMale(), raceData);
// Add head and hair
data->setPart(ESM::PRT_Head, npc.mHead, 0);
data->setPart(ESM::PRT_Hair, npc.mHair, 0);
// Add inventory items // Add inventory items
for (auto& item : npc.mInventory.mList) for (auto& item : npc.mInventory.mList)
{ {
@ -537,10 +541,6 @@ namespace CSMWorld
std::string itemId = item.mItem.toString(); std::string itemId = item.mItem.toString();
addNpcItem(itemId, data); addNpcItem(itemId, data);
} }
// Add head and hair
data->setPart(ESM::PRT_Head, npc.mHead, 0);
data->setPart(ESM::PRT_Hair, npc.mHair, 0);
} }
void ActorAdapter::addNpcItem(const std::string& itemId, ActorDataPtr data) void ActorAdapter::addNpcItem(const std::string& itemId, ActorDataPtr data)
@ -574,6 +574,10 @@ namespace CSMWorld
partId = part.mMale; partId = part.mMale;
data->setPart(partType, partId, priority); data->setPart(partType, partId, priority);
// An another vanilla quirk: hide hairs if an item replaces Head part
if (partType == ESM::PRT_Head)
data->setPart(ESM::PRT_Hair, "", priority);
} }
}; };