1 files changed, 22 insertions, 15 deletions

diff --git a/pokemodr/BadgeUI.cpp b/pokemodr/BadgeUI.cpp
index 5f0e46e5..c6edda26 100644
--- a/pokemodr/BadgeUI.cpp
+++ b/pokemodr/BadgeUI.cpp
@@ -22,17 +22,19 @@
 
 #include <QListWidgetItem>
 #include <QMetaObject>
-#include "../general/BugCatcher.h"
-#include "../general/Exception.h"
-#include "../general/ImageCache.h"
-#include "../general/Ref.h"
-#include "../pokemod/Pokemod.h"
+
+#include <BugCatcher.h>
+#include <Exception.h>
+#include <ImageCache.h>
+#include <Ref.h>
+
+#include <Pokemod.h>
+
 #include "ImageDialog.h"
 #include "BadgeUI.h"
 
 BadgeUI::BadgeUI(Badge* b, QWidget* parent) :
         ObjectUI(parent),
-        curStat(ST_HP),
         badge(b),
         badge_mod(new Badge(b->getPokemod(), *b, b->getId()))
 {
@@ -55,20 +57,26 @@ void BadgeUI::setGui()
     varName->setText(badge_mod->getName());
     varObey->setMaximum(badge->getPokemod()->getRules()->getMaxLevel());
     varObey->setValue(badge_mod->getObey());
-    varStat->setCurrentIndex(curStat);
     try
     {
         varFace->setIcon(ImageCache::open(badge_mod->getFace()));
+    }
+    catch (OpenException& e)
+    {
+        BugCatcher::report(e);
+    }
+    try
+    {
         varBadge->setIcon(ImageCache::open(badge_mod->getBadge()));
     }
     catch (OpenException& e)
     {
         BugCatcher::report(e);
     }
-    varMultiplierNum->setValue(badge_mod->getStat(curStat).getNum());
-    varMultiplierDenom->setValue(badge_mod->getStat(curStat).getDenom());
-    varMultiplierNum->setMaximum(badge_mod->getStat(curStat).getDenom());
-    varMultiplier->setText(QString::number(badge_mod->getStat(curStat), 'g', 15));
+    varMultiplierNum->setValue(badge_mod->getStat(varStat->currentIndex()).getNum());
+    varMultiplierDenom->setValue(badge_mod->getStat(varStat->currentIndex()).getDenom());
+    varMultiplierNum->setMaximum(badge_mod->getStat(varStat->currentIndex()).getDenom());
+    varMultiplier->setText(QString::number(badge_mod->getStat(varStat->currentIndex()), 'g', DBL_PREC));
     for (unsigned i = 0; i < HM_End_All; ++i)
         varHMs->item(i)->setSelected(badge_mod->getHm(i));
 }
@@ -138,9 +146,8 @@ void BadgeUI::on_varBadge_pressed()
     }
 }
 
-void BadgeUI::on_varStat_currentIndexChanged(const int s)
+void BadgeUI::on_varStat_currentIndexChanged()
 {
-    curStat = s;
     emit(setChanged(true));
     setGui();
 }
@@ -149,7 +156,7 @@ void BadgeUI::on_varMultiplierNum_valueChanged(const int m)
 {
     try
     {
-        badge_mod->setStatNum(curStat, m);
+        badge_mod->setStatNum(varStat->currentIndex(), m);
         emit(setChanged(true));
     }
     catch (Exception& e)
@@ -163,7 +170,7 @@ void BadgeUI::on_varMultiplierDenom_valueChanged(const int m)
 {
     try
     {
-        badge_mod->setStatDenom(curStat, m);
+        badge_mod->setStatDenom(varStat->currentIndex(), m);
         emit(setChanged(true));
     }
     catch (Exception& e)