From 6037c44ea6850595bace11f5f0bde64f5ae8f31e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 3 Mar 2013 12:41:57 +0100
Subject: [PATCH] Fix ingredient effect display

---
 apps/openmw/mwgui/spellicons.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/apps/openmw/mwgui/spellicons.cpp b/apps/openmw/mwgui/spellicons.cpp
index dcbbed49c..16e02ebba 100644
--- a/apps/openmw/mwgui/spellicons.cpp
+++ b/apps/openmw/mwgui/spellicons.cpp
@@ -124,6 +124,17 @@ namespace MWGui
                 effectInfo.mRemainingTime = effectIt->mDuration +
                         (it->second.first - MWBase::Environment::get().getWorld()->getTimeStamp())*3600/timeScale;
 
+                // ingredients need special casing for their magnitude / duration
+                /// \todo duplicated from ActiveSpells, helper function?
+                if (MWBase::Environment::get().getWorld()->getStore().get<ESM::Ingredient>().search (it->first))
+                {
+                    effectInfo.mRemainingTime = effectIt->mDuration * it->second.second +
+                            (it->second.first - MWBase::Environment::get().getWorld()->getTimeStamp())*3600/timeScale;
+
+                    effectInfo.mMagnitude = static_cast<int> (0.05*it->second.second / (0.1 * magicEffect->mData.mBaseCost));
+                }
+
+
                 effects[effectIt->mEffectID].push_back (effectInfo);
             }
         }