mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 13:36:44 +00:00
Code Issues Releases Wiki Activity

Merge branch 'classyimage' into 'master'

Browse source 
Handle non-string RefIds when displaying a class image

See merge request OpenMW/openmw!3111
This commit is contained in:
psi29a 2023-06-07 06:51:24 +00:00
commit 75c371de66
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwgui/class.cpp
View file

@ -889,14 +889,21 @@ namespace MWGui
void setClassImage(MyGUI::ImageBox* imageBox, const ESM::RefId& classId) 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); imageBox->setImageTexture(classImage);
} }