From 61ec9196c81173ec92fc1b5056de265ef34bdf3e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 5 Feb 2015 01:08:26 +0100
Subject: [PATCH] Cap the displayed attribute multiplier in levelup to
 attribute points left to 100

---
 apps/openmw/mwgui/levelupdialog.cpp  | 1 +
 apps/openmw/mwmechanics/npcstats.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index 8553811aa..6759824f9 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -176,6 +176,7 @@ namespace MWGui
                 availableAttributes++;
 
                 int mult = pcStats.getLevelupAttributeMultiplier (i);
+                mult = std::min(mult, 100-pcStats.getAttribute(i).getBase());
                 text->setCaption(mult <= 1 ? "" : "x" + MyGUI::utility::toString(mult));
             }
             else
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 9d3d967b9..3aa034a3c 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -268,6 +268,7 @@ void MWMechanics::NpcStats::levelUp()
         MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
 
     mLevelProgress -= gmst.find("iLevelUpTotal")->getInt();
+    mLevelProgress = std::max(0, mLevelProgress); // might be necessary when levelup was invoked via console
 
     for (int i=0; i<ESM::Attribute::Length; ++i)
         mSkillIncreases[i] = 0;