From 89be1069a78e858f431112d6b0bc8423a6da6aa3 Mon Sep 17 00:00:00 2001 From: cc9cii Date: Mon, 14 Apr 2014 18:31:46 +1000 Subject: [PATCH] Bug #1260: show thief.dds image for a custom class level up menu --- apps/openmw/mwgui/levelupdialog.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp index 2f11a4d12..cd72f5677 100644 --- a/apps/openmw/mwgui/levelupdialog.cpp +++ b/apps/openmw/mwgui/levelupdialog.cpp @@ -131,7 +131,14 @@ namespace MWGui const ESM::Class *cls = world->getStore().get().find(playerData->mClass); - mClassImage->setImageTexture ("textures\\levelup\\" + cls->mId + ".dds"); + // Vanilla uses thief.dds for custom classes. A player with a custom class + // doesn't have mId set, see mwworld/esmstore.hpp where it is initialised as + // "$dynamic0". This check should resolve bug #1260. + if(world->getStore().get().isDynamic(cls->mId)) + mClassImage->setImageTexture ("textures\\levelup\\thief.dds"); + else + mClassImage->setImageTexture ("textures\\levelup\\" + cls->mId + ".dds"); + int level = creatureStats.getLevel ()+1; mLevelText->setCaptionWithReplacing("#{sLevelUpMenu1} " + boost::lexical_cast(level));