From 623783cd6ac77da581a8106aee5abfa02bec2feb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 10 Dec 2014 18:05:11 +0100
Subject: [PATCH] Enchanting: fix cast cost for "on use" enchantments being set
 incorrectly

---
 apps/openmw/mwgui/enchantingdialog.cpp | 4 ++--
 apps/openmw/mwmechanics/enchanting.cpp | 6 +++---
 apps/openmw/mwmechanics/enchanting.hpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp
index 30d67f554..56caa6513 100644
--- a/apps/openmw/mwgui/enchantingdialog.cpp
+++ b/apps/openmw/mwgui/enchantingdialog.cpp
@@ -109,8 +109,8 @@ namespace MWGui
         mCharge->setCaption(boost::lexical_cast<std::string>(mEnchanting.getGemCharge()));
 
         std::stringstream castCost;
-        castCost << std::setprecision(1) << std::fixed << mEnchanting.getCastCost();
-        mCastCost->setCaption(boost::lexical_cast<std::string>(castCost.str()));
+        castCost << mEnchanting.getCastCost();
+        mCastCost->setCaption(castCost.str());
 
         mPrice->setCaption(boost::lexical_cast<std::string>(mEnchanting.getEnchantPrice()));
 
diff --git a/apps/openmw/mwmechanics/enchanting.cpp b/apps/openmw/mwmechanics/enchanting.cpp
index 759b2a7bb..8c85e5eef 100644
--- a/apps/openmw/mwmechanics/enchanting.cpp
+++ b/apps/openmw/mwmechanics/enchanting.cpp
@@ -55,7 +55,7 @@ namespace MWMechanics
         enchantment.mData.mCharge = getGemCharge();
         enchantment.mData.mAutocalc = 0;
         enchantment.mData.mType = mCastStyle;
-        enchantment.mData.mCost = getEnchantPoints();
+        enchantment.mData.mCost = getCastCost();
 
         store.remove(mSoulGemPtr, 1, player);
 
@@ -199,7 +199,7 @@ namespace MWMechanics
     }
 
 
-    float Enchanting::getCastCost() const
+    int Enchanting::getCastCost() const
     {
         if (mCastStyle == ESM::Enchantment::ConstantEffect)
             return 0;
@@ -215,7 +215,7 @@ namespace MWMechanics
          */
         const float castCost = enchantCost - (enchantCost / 100) * (eSkill - 10);
 
-        return (castCost < 1) ? 1 : castCost;
+        return static_cast<int>((castCost < 1) ? 1 : castCost);
     }
 
 
diff --git a/apps/openmw/mwmechanics/enchanting.hpp b/apps/openmw/mwmechanics/enchanting.hpp
index d41305c4a..2ee5ccce4 100644
--- a/apps/openmw/mwmechanics/enchanting.hpp
+++ b/apps/openmw/mwmechanics/enchanting.hpp
@@ -36,7 +36,7 @@ namespace MWMechanics
             void nextCastStyle(); //Set enchant type to next possible type (for mOldItemPtr object)
             int getCastStyle() const;
             int getEnchantPoints() const;
-            float getCastCost() const;
+            int getCastCost() const;
             int getEnchantPrice() const;
             int getMaxEnchantValue() const;
             int getGemCharge() const;