Do not display negative stat values

Display zero instead of negative values. Also remove useless for loops and some unused attributes.
gmalmquist · Dec 9, 2013 · 357ecd9 · 357ecd9
1 parent fc8bd1a
commit 357ecd9
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 90 deletions.
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
@@ -174,38 +174,32 @@ namespace MWGui
 
     void HUD::setValue(const std::string& id, const MWMechanics::DynamicStat<float>& value)
     {
-        static const char *ids[] =
-        {
-            "HBar", "MBar", "FBar", 0
-        };
+        int current = std::max(0, static_cast<int>(value.getCurrent()));
+        int modified = static_cast<int>(value.getModified());
 
-        for (int i=0; ids[i]; ++i)
-            if (ids[i]==id)
-            {
-                MyGUI::Widget* w;
-                std::string valStr = boost::lexical_cast<std::string>(value.getCurrent()) + "/" + boost::lexical_cast<std::string>(value.getModified());
-                switch (i)
-                {
-                    case 0:
-                        mHealth->setProgressRange (value.getModified());
-                        mHealth->setProgressPosition (value.getCurrent());
-                        getWidget(w, "HealthFrame");
-                        w->setUserString("Caption_HealthDescription", "#{sHealthDesc}\n" + valStr);
-                        break;
-                    case 1:
-                        mMagicka->setProgressRange (value.getModified());
-                        mMagicka->setProgressPosition (value.getCurrent());
-                        getWidget(w, "MagickaFrame");
-                        w->setUserString("Caption_HealthDescription", "#{sIntDesc}\n" + valStr);
-                        break;
-                    case 2:
-                        mStamina->setProgressRange (value.getModified());
-                        mStamina->setProgressPosition (value.getCurrent());
-                        getWidget(w, "FatigueFrame");
-                        w->setUserString("Caption_HealthDescription", "#{sFatDesc}\n" + valStr);
-                        break;
-                }
-            }
+        MyGUI::Widget* w;
+        std::string valStr = boost::lexical_cast<std::string>(current) + "/" + boost::lexical_cast<std::string>(modified);
+        if (id == "HBar")
+        {
+            mHealth->setProgressRange(modified);
+            mHealth->setProgressPosition(current);
+            getWidget(w, "HealthFrame");
+            w->setUserString("Caption_HealthDescription", "#{sHealthDesc}\n" + valStr);
+        }
+        else if (id == "MBar")
+        {
+            mMagicka->setProgressRange (modified);
+            mMagicka->setProgressPosition (current);
+            getWidget(w, "MagickaFrame");
+            w->setUserString("Caption_HealthDescription", "#{sIntDesc}\n" + valStr);
+        }
+        else if (id == "FBar")
+        {
+            mStamina->setProgressRange (modified);
+            mStamina->setProgressPosition (current);
+            getWidget(w, "FatigueFrame");
+            w->setUserString("Caption_HealthDescription", "#{sFatDesc}\n" + valStr);
+        }
     }
 
     void HUD::setDrowningTimeLeft(float time)

diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
@@ -134,38 +134,28 @@ namespace MWGui
 
     void StatsWindow::setValue (const std::string& id, const MWMechanics::DynamicStat<float>& value)
     {
-        static const char *ids[] =
-        {
-            "HBar", "MBar", "FBar",
-            0
-        };
+        int current = std::max(0, static_cast<int>(value.getCurrent()));
+        int modified = static_cast<int>(value.getModified());
 
-        for (int i=0; ids[i]; ++i)
-        {
-            if (ids[i]==id)
-            {
-                std::string id (ids[i]);
-                setBar (id, id + "T", static_cast<int>(value.getCurrent()), static_cast<int>(value.getModified()));
+        setBar (id, id + "T", current, modified);
 
-                // health, magicka, fatigue tooltip
-                MyGUI::Widget* w;
-                std::string valStr =  boost::lexical_cast<std::string>(int(value.getCurrent())) + "/" + boost::lexical_cast<std::string>(int(value.getModified()));
-                if (i==0)
-                {
-                    getWidget(w, "Health");
-                    w->setUserString("Caption_HealthDescription", "#{sHealthDesc}\n" + valStr);
-                }
-                else if (i==1)
-                {
-                    getWidget(w, "Magicka");
-                    w->setUserString("Caption_HealthDescription", "#{sIntDesc}\n" + valStr);
-                }
-                else if (i==2)
-                {
-                    getWidget(w, "Fatigue");
-                    w->setUserString("Caption_HealthDescription", "#{sFatDesc}\n" + valStr);
-                }
-            }
+        // health, magicka, fatigue tooltip
+        MyGUI::Widget* w;
+        std::string valStr =  boost::lexical_cast<std::string>(current) + "/" + boost::lexical_cast<std::string>(modified);
+        if (id == "HBar")
+        {
+            getWidget(w, "Health");
+            w->setUserString("Caption_HealthDescription", "#{sHealthDesc}\n" + valStr);
+        }
+        else if (id == "MBar")
+        {
+            getWidget(w, "Magicka");
+            w->setUserString("Caption_HealthDescription", "#{sIntDesc}\n" + valStr);
+        }
+        else if (id == "FBar")
+        {
+            getWidget(w, "Fatigue");
+            w->setUserString("Caption_HealthDescription", "#{sFatDesc}\n" + valStr);
         }
     }
 

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -112,9 +112,6 @@ namespace MWGui
       , mPlayerMinorSkills()
       , mPlayerMajorSkills()
       , mPlayerSkillValues()
-      , mPlayerHealth()
-      , mPlayerMagicka()
-      , mPlayerFatigue()
       , mGui(NULL)
       , mGuiModes()
       , mCursorManager(NULL)
@@ -590,31 +587,7 @@ namespace MWGui
         mStatsWindow->setValue (id, value);
         mHud->setValue (id, value);
         mCharGen->setValue(id, value);
-        if (id == "HBar")
-        {
-            mPlayerHealth = value;
-        }
-        else if (id == "MBar")
-        {
-            mPlayerMagicka = value;
-        }
-        else if (id == "FBar")
-        {
-            mPlayerFatigue = value;
-        }
-    }
-
-    #if 0
-    MWMechanics::DynamicStat<int> WindowManager::getValue(const std::string& id)
-    {
-        if(id == "HBar")
-            return mPlayerHealth;
-        else if (id == "MBar")
-            return mPlayerMagicka;
-        else if (id == "FBar")
-            return mPlayerFatigue;
     }
-    #endif
 
     void WindowManager::setValue (const std::string& id, const std::string& value)
     {

diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -346,8 +346,6 @@ namespace MWGui
     std::map<int, MWMechanics::Stat<int> > mPlayerAttributes;
     SkillList mPlayerMajorSkills, mPlayerMinorSkills;
     std::map<int, MWMechanics::Stat<float> > mPlayerSkillValues;
-    MWMechanics::DynamicStat<float> mPlayerHealth, mPlayerMagicka, mPlayerFatigue;
-
 
     MyGUI::Gui *mGui; // Gui
     std::vector<GuiMode> mGuiModes;