From 73268a8606df642fe360e028b491eccebdc2f608 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 13 Jan 2014 07:05:52 +0100
Subject: [PATCH] Fix skill progress not working

---
 apps/openmw/mwgui/statswindow.cpp    |  2 +-
 apps/openmw/mwmechanics/npcstats.cpp |  2 +-
 apps/openmw/mwmechanics/stat.hpp     | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index 17bb24e83..37128c43f 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -185,7 +185,7 @@ namespace MWGui
         MyGUI::TextBox* widget = mSkillWidgetMap[(int)parSkill];
         if (widget)
         {
-            float modified = value.getModified(), base = value.getBase();
+            int modified = value.getModified(), base = value.getBase();
             std::string text = boost::lexical_cast<std::string>(std::floor(modified));
             std::string state = "normal";
             if (modified > base)
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index 289fcc70f..f77b04271 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -207,7 +207,7 @@ void MWMechanics::NpcStats::useSkill (int skillIndex, const ESM::Class& class_,
     if(mIsWerewolf)
         return;
 
-    MWMechanics::SkillValue value = getSkill (skillIndex);
+    MWMechanics::SkillValue& value = getSkill (skillIndex);
 
     value.setProgress(value.getProgress() + getSkillGain (skillIndex, class_, usageType));
 
diff --git a/apps/openmw/mwmechanics/stat.hpp b/apps/openmw/mwmechanics/stat.hpp
index e66cf86de..75ac6939a 100644
--- a/apps/openmw/mwmechanics/stat.hpp
+++ b/apps/openmw/mwmechanics/stat.hpp
@@ -246,6 +246,18 @@ namespace MWMechanics
     {
         return !(left == right);
     }
+
+    inline bool operator== (const SkillValue& left, const SkillValue& right)
+    {
+        return left.getBase() == right.getBase()
+                && left.getModifier() == right.getModifier()
+                && left.getDamage() == right.getDamage()
+                && left.getProgress() == right.getProgress();
+    }
+    inline bool operator!= (const SkillValue& left, const SkillValue& right)
+    {
+        return !(left == right);
+    }
 }
 
 #endif