Deduplicate specialization code

apps/openmw/mwgui/class.cpp

@@ -254,10 +254,8 @@ namespace MWGui
         ESM::Class::Specialization specialization
             = static_cast<ESM::Class::Specialization>(klass->mData.mSpecialization);
 
-        static const std::string_view specIds[3]
-            = { "sSpecializationCombat", "sSpecializationMagic", "sSpecializationStealth" };
         std::string specName{ MWBase::Environment::get().getWindowManager()->getGameSettingString(
-            specIds[specialization], specIds[specialization]) };
+            ESM::Class::sGmstSpecializationIds[specialization], ESM::Class::sGmstSpecializationIds[specialization]) };
         mSpecializationName->setCaption(specName);
         ToolTips::createSpecializationToolTip(mSpecializationName, specName, specialization);
 
@@ -579,11 +577,10 @@ namespace MWGui
 
     void CreateClassDialog::setSpecialization(int id)
     {
-        mSpecializationId = (ESM::Class::Specialization)id;
+        mSpecializationId = ESM::Class::Specialization(id);
-        static const std::string_view specIds[3]
-            = { "sSpecializationCombat", "sSpecializationMagic", "sSpecializationStealth" };
         std::string specName{ MWBase::Environment::get().getWindowManager()->getGameSettingString(
-            specIds[mSpecializationId], specIds[mSpecializationId]) };
+            ESM::Class::sGmstSpecializationIds[mSpecializationId],
+            ESM::Class::sGmstSpecializationIds[mSpecializationId]) };
         mSpecializationName->setCaption(specName);
         ToolTips::createSpecializationToolTip(mSpecializationName, specName, mSpecializationId);
     }

apps/openmw/mwgui/tooltips.cpp

@@ -936,13 +936,9 @@ namespace MWGui
             return;
 
         int spec = playerClass.mData.mSpecialization;
-        std::string specStr;
+        std::string specStr = "#{";
-        if (spec == 0)
+        specStr += ESM::Class::sGmstSpecializationIds[spec];
-            specStr = "#{sSpecializationCombat}";
+        specStr += '}';
-        else if (spec == 1)
-            specStr = "#{sSpecializationMagic}";
-        else if (spec == 2)
-            specStr = "#{sSpecializationStealth}";
 
         widget->setUserString("Caption_ClassName", playerClass.mName);
         widget->setUserString("Caption_ClassDescription", playerClass.mDescription);

components/esm/defs.hpp

@@ -32,13 +32,6 @@ namespace ESM
     // Pixel color value. Standard four-byte rr,gg,bb,aa format.
     typedef uint32_t Color;
 
-    enum Specialization
-    {
-        SPC_Combat = 0,
-        SPC_Magic = 1,
-        SPC_Stealth = 2
-    };
-
     enum RangeType
     {
         RT_Self = 0,

components/esm3/loadclas.cpp

@@ -8,9 +8,7 @@
 
 namespace ESM
 {
-    const Class::Specialization Class::sSpecializationIds[3] = { Class::Combat, Class::Magic, Class::Stealth };
+    const std::string_view Class::sGmstSpecializationIds[3]
-
-    const char* Class::sGmstSpecializationIds[3]
         = { "sSpecializationCombat", "sSpecializationMagic", "sSpecializationStealth" };
 
     int& Class::CLDTstruct::getSkill(int index, bool major)

components/esm3/loadclas.hpp

@@ -29,8 +29,7 @@ namespace ESM
             Stealth = 2
         };
 
-        static const Specialization sSpecializationIds[3];
+        static const std::string_view sGmstSpecializationIds[3];
-        static const char* sGmstSpecializationIds[3];
 
         struct CLDTstruct
         {