Merge branch 'classyimage' into 'master'

Handle non-string RefIds when displaying a class image

See merge request OpenMW/openmw!3111

apps/openmw/mwgui/class.cpp

@@ -889,14 +889,21 @@ namespace MWGui
 
     void setClassImage(MyGUI::ImageBox* imageBox, const ESM::RefId& classId)
     {
-        const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+        std::string_view fallback = "textures\\levelup\\warrior.dds";
-        std::string classImage
+        std::string classImage;
-            = Misc::ResourceHelpers::correctTexturePath("textures\\levelup\\" + classId.getRefIdString() + ".dds", vfs);
+        if (const auto* id = classId.getIf<ESM::StringRefId>())
-        if (!vfs->exists(classImage))
         {
-            Log(Debug::Warning) << "No class image for " << classId << ", falling back to default";
+            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
-            classImage = "textures\\levelup\\warrior.dds";
+            classImage
+                = Misc::ResourceHelpers::correctTexturePath("textures\\levelup\\" + id->getValue() + ".dds", vfs);
+            if (!vfs->exists(classImage))
+            {
+                Log(Debug::Warning) << "No class image for " << classId << ", falling back to default";
+                classImage = fallback;
+            }
         }
+        else
+            classImage = fallback;
         imageBox->setImageTexture(classImage);
     }