Merge remote-tracking branch 'cc9cii/Bug-No-1260'

apps/openmw/mwgui/levelupdialog.cpp

@@ -131,7 +131,22 @@ namespace MWGui
         const ESM::Class *cls =
             world->getStore().get<ESM::Class>().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.
+        // Choosing Stealth specialization and Speed/Agility as attributes.
+        if(world->getStore().get<ESM::Class>().isDynamic(cls->mId))
+        {
+            MWWorld::SharedIterator<ESM::Class> it = world->getStore().get<ESM::Class>().begin();
+            for(; it != world->getStore().get<ESM::Class>().end(); it++)
+            {
+                if(it->mData.mIsPlayable && it->mData.mSpecialization == 2 && it->mData.mAttribute[0] == 4 && it->mData.mAttribute[1] == 3)
+                    break;
+            }
+            mClassImage->setImageTexture ("textures\\levelup\\" + it->mId + ".dds");
+        }
+        else
+            mClassImage->setImageTexture ("textures\\levelup\\" + cls->mId + ".dds");
 
         int level = creatureStats.getLevel ()+1;
         mLevelText->setCaptionWithReplacing("#{sLevelUpMenu1} " + boost::lexical_cast<std::string>(level));