From 3fbf918751c0e6ea5f945069a3099e4df388421d Mon Sep 17 00:00:00 2001
From: Jordan Ayers <jordan.ayers@gmail.com>
Date: Tue, 5 Nov 2013 19:42:55 -0600
Subject: [PATCH] Chargen Review Dialog: Init fix.

Load the starting Health/Magicka/Fatigue from the player stats when
creating the Review Dialog, and remove the extra copy of these stats.
In some cases, the old stat values were never updated from 0/0.
---
 apps/openmw/mwgui/charactercreation.cpp | 26 ++++++++-----------------
 apps/openmw/mwgui/charactercreation.hpp |  9 ---------
 apps/openmw/mwgui/windowmanagerimp.cpp  |  5 +----
 3 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index eb087ea07..b829f219d 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -219,9 +219,14 @@ namespace MWGui
                 mReviewDialog->setClass(mPlayerClass);
                 mReviewDialog->setBirthSign(mPlayerBirthSignId);
 
-                mReviewDialog->setHealth(mPlayerHealth);
-                mReviewDialog->setMagicka(mPlayerMagicka);
-                mReviewDialog->setFatigue(mPlayerFatigue);
+                {
+                    MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+                    MWMechanics::CreatureStats stats = MWWorld::Class::get(player).getCreatureStats(player);
+
+                    mReviewDialog->setHealth ( stats.getHealth()  );
+                    mReviewDialog->setMagicka( stats.getMagicka() );
+                    mReviewDialog->setFatigue( stats.getFatigue() );
+                }
 
                 {
                     std::map<int, MWMechanics::Stat<int> > attributes = MWBase::Environment::get().getWindowManager()->getPlayerAttributeValues();
@@ -258,21 +263,6 @@ namespace MWGui
             mRaceDialog->doRenderUpdate();
     }
 
-    void CharacterCreation::setPlayerHealth (const MWMechanics::DynamicStat<float>& value)
-    {
-        mPlayerHealth = value;
-    }
-
-    void CharacterCreation::setPlayerMagicka (const MWMechanics::DynamicStat<float>& value)
-    {
-        mPlayerMagicka = value;
-    }
-
-    void CharacterCreation::setPlayerFatigue (const MWMechanics::DynamicStat<float>& value)
-    {
-        mPlayerFatigue = value;
-    }
-
     void CharacterCreation::onReviewDialogDone(WindowBase* parWindow)
     {
         MWBase::Environment::get().getWindowManager()->removeDialog(mReviewDialog);
diff --git a/apps/openmw/mwgui/charactercreation.hpp b/apps/openmw/mwgui/charactercreation.hpp
index bb2a69a7a..b80aaae41 100644
--- a/apps/openmw/mwgui/charactercreation.hpp
+++ b/apps/openmw/mwgui/charactercreation.hpp
@@ -31,12 +31,6 @@ namespace MWGui
     //Show a dialog
     void spawnDialog(const char id);
 
-    void setPlayerHealth (const MWMechanics::DynamicStat<float>& value);
-
-    void setPlayerMagicka (const MWMechanics::DynamicStat<float>& value);
-
-    void setPlayerFatigue (const MWMechanics::DynamicStat<float>& value);
-
     void setValue (const std::string& id, const MWMechanics::Stat<int>& value);
     void setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value);
     void setValue(const ESM::Skill::SkillEnum parSkill, const MWMechanics::Stat<float>& value);
@@ -60,9 +54,6 @@ namespace MWGui
     std::string mPlayerRaceId;
     std::string mPlayerBirthSignId;
     ESM::Class mPlayerClass;
-    MWMechanics::DynamicStat<float> mPlayerHealth;
-    MWMechanics::DynamicStat<float> mPlayerMagicka;
-    MWMechanics::DynamicStat<float> mPlayerFatigue;
 
     //Class generation vars
     unsigned mGenerateClassStep;                 // Keeps track of current step in Generate Class dialog
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 4b4d2dfd1..76ae65eb9 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -581,17 +581,14 @@ namespace MWGui
         if (id == "HBar")
         {
             mPlayerHealth = value;
-            mCharGen->setPlayerHealth (value);
         }
         else if (id == "MBar")
         {
             mPlayerMagicka = value;
-            mCharGen->setPlayerMagicka (value);
         }
         else if (id == "FBar")
         {
             mPlayerFatigue = value;
-            mCharGen->setPlayerFatigue (value);
         }
     }
 
@@ -599,7 +596,7 @@ namespace MWGui
     MWMechanics::DynamicStat<int> WindowManager::getValue(const std::string& id)
     {
         if(id == "HBar")
-            return layerHealth;
+            return mPlayerHealth;
         else if (id == "MBar")
             return mPlayerMagicka;
         else if (id == "FBar")