From f36782bff0516e44b7cd8025ebceacf14cfd945a Mon Sep 17 00:00:00 2001 From: William JCM Date: Fri, 11 Mar 2022 10:58:13 +0100 Subject: [PATCH] ArmourPart: auto-fill ArmourSlot using ArmourSlots.hpp. --- src/Mass/ArmourPart.h | 41 +++-------------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/src/Mass/ArmourPart.h b/src/Mass/ArmourPart.h index 90287f2..9f7a96c 100644 --- a/src/Mass/ArmourPart.h +++ b/src/Mass/ArmourPart.h @@ -28,44 +28,9 @@ using namespace Corrade; using namespace Magnum; enum class ArmourSlot { - Face = 0, - UpperHead = 1, - LowerHead = 2, - Neck = 3, - UpperBody = 4, - MiddleBody = 5, - LowerBody = 6, - FrontWaist = 7, - LeftFrontSkirt = 8, - RightFrontSkirt = 9, - LeftSideSkirt = 10, - RightSideSkirt = 11, - LeftBackSkirt = 12, - RightBackSkirt = 13, - BackWaist = 14, - LeftShoulder = 15, - RightShoulder = 16, - LeftUpperArm = 17, - RightUpperArm = 18, - LeftElbow = 19, - RightElbow = 20, - LeftLowerArm = 21, - RightLowerArm = 22, - Backpack = 23, - LeftHand = 24, - RightHand = 25, - LeftUpperLeg = 26, - RightUpperLeg = 27, - LeftKnee = 28, - RightKnee = 29, - LeftLowerLeg = 30, - RightLowerLeg = 31, - LeftAnkle = 32, - RightAnkle = 33, - LeftHeel = 34, - RightHeel = 35, - LeftFoot = 36, - RightFoot = 37, + #define c(enumerator, enumstr, name) enumerator, + #include "../Maps/ArmourSlots.hpp" + #undef c }; struct ArmourPart {