From 32601e0ae48da869347b9509d4d5e05049c0f6c3 Mon Sep 17 00:00:00 2001
From: Alexei Dobrohotov <alexdobrohotov@yandex.ru>
Date: Fri, 11 Dec 2020 08:56:28 +0300
Subject: [PATCH] Properly reserve body parts for skirts (bug #5731)

---
 CHANGELOG.md                             |  1 +
 apps/opencs/model/world/actoradapter.cpp | 51 +++++++-----------------
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 219234a38..d399bcb30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,7 @@
     Bug #5688: Water shader broken indoors with enable indoor shadows = false
     Bug #5695: ExplodeSpell for actors doesn't target the ground
     Bug #5703: OpenMW-CS menu system crashing on XFCE
+    Bug #5731: Editor: skirts are invisible on characters
     Feature #390: 3rd person look "over the shoulder"
     Feature #2386: Distant Statics in the form of Object Paging
     Feature #2404: Levelled List can not be placed into a container
diff --git a/apps/opencs/model/world/actoradapter.cpp b/apps/opencs/model/world/actoradapter.cpp
index 5ed80a1e4..8558aa9bc 100644
--- a/apps/opencs/model/world/actoradapter.cpp
+++ b/apps/opencs/model/world/actoradapter.cpp
@@ -593,56 +593,33 @@ namespace CSMWorld
         }
         else if (type == UniversalId::Type_Clothing)
         {
-            int priority = 0;
-            // TODO: reserve bodyparts for robes and skirts
             auto& clothing = dynamic_cast<const Record<ESM::Clothing>&>(record).get();
 
+            std::vector<ESM::PartReferenceType> parts;
             if (clothing.mData.mType == ESM::Clothing::Robe)
             {
-                auto reservedList = std::vector<ESM::PartReference>();
-
-                ESM::PartReference pr;
-                pr.mMale = "";
-                pr.mFemale = "";
-
-                ESM::PartReferenceType parts[] = {
+                parts = {
                     ESM::PRT_Groin, ESM::PRT_Skirt, ESM::PRT_RLeg, ESM::PRT_LLeg,
                     ESM::PRT_RUpperarm, ESM::PRT_LUpperarm, ESM::PRT_RKnee, ESM::PRT_LKnee,
-                    ESM::PRT_RForearm, ESM::PRT_LForearm
+                    ESM::PRT_RForearm, ESM::PRT_LForearm, ESM::PRT_Cuirass
                 };
-                size_t parts_size = sizeof(parts)/sizeof(parts[0]);
-                for(size_t p = 0;p < parts_size;++p)
-                {
-                    pr.mPart = parts[p];
-                    reservedList.push_back(pr);
-                }
-
-                priority = parts_size;
-                addParts(reservedList, priority);
             }
             else if (clothing.mData.mType == ESM::Clothing::Skirt)
             {
-                auto reservedList = std::vector<ESM::PartReference>();
-
-                ESM::PartReference pr;
-                pr.mMale = "";
-                pr.mFemale = "";
-
-                ESM::PartReferenceType parts[] = {
-                    ESM::PRT_Groin, ESM::PRT_RLeg, ESM::PRT_LLeg
-                };
-                size_t parts_size = sizeof(parts)/sizeof(parts[0]);
-                for(size_t p = 0;p < parts_size;++p)
-                {
-                    pr.mPart = parts[p];
-                    reservedList.push_back(pr);
-                }
-
-                priority = parts_size;
-                addParts(reservedList, priority);
+                parts = {ESM::PRT_Groin, ESM::PRT_RLeg, ESM::PRT_LLeg};
             }
 
+            std::vector<ESM::PartReference> reservedList;
+            for (const auto& p : parts)
+            {
+                ESM::PartReference pr;
+                pr.mPart = p;
+                reservedList.emplace_back(pr);
+            }
+
+            int priority = parts.size();
             addParts(clothing.mParts.mParts, priority);
+            addParts(reservedList, priority);
 
             // Changing parts could affect what is picked for rendering
             data->addOtherDependency(itemId);