From 29ac97be7adf4d8bb0156dceadb378f6d87be389 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 20 Oct 2014 17:28:22 +0200
Subject: [PATCH] Add automatic potion naming

---
 apps/openmw/mwgui/alchemywindow.cpp |  5 +++++
 apps/openmw/mwgui/alchemywindow.hpp |  2 ++
 apps/openmw/mwmechanics/alchemy.cpp | 11 +++++++++++
 apps/openmw/mwmechanics/alchemy.hpp |  3 +++
 4 files changed, 21 insertions(+)

diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index 0fa9121b7..e67a8512a 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -173,6 +173,11 @@ namespace MWGui
 
     void AlchemyWindow::update()
     {
+        std::string suggestedName = mAlchemy.suggestPotionName();
+        if (suggestedName != mSuggestedPotionName)
+            mNameEdit->setCaptionWithReplacing(suggestedName);
+        mSuggestedPotionName = suggestedName;
+
         mSortModel->clearDragItems();
 
         MWMechanics::Alchemy::TIngredientsIterator it = mAlchemy.beginIngredients ();
diff --git a/apps/openmw/mwgui/alchemywindow.hpp b/apps/openmw/mwgui/alchemywindow.hpp
index b538a1f80..36f540c1b 100644
--- a/apps/openmw/mwgui/alchemywindow.hpp
+++ b/apps/openmw/mwgui/alchemywindow.hpp
@@ -23,6 +23,8 @@ namespace MWGui
         virtual void exit();
 
     private:
+        std::string mSuggestedPotionName;
+
         ItemView* mItemView;
         SortFilterItemModel* mSortModel;
 
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index 5549c85ed..328f3a25d 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -480,3 +480,14 @@ MWMechanics::Alchemy::Result MWMechanics::Alchemy::create (const std::string& na
 
     return Result_Success;
 }
+
+std::string MWMechanics::Alchemy::suggestPotionName()
+{
+    std::set<MWMechanics::EffectKey> effects = listEffects();
+    if (effects.empty())
+        return "";
+
+    int effectId = effects.begin()->mId;
+    return MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find(
+                ESM::MagicEffect::effectIdToString(effectId));
+}
diff --git a/apps/openmw/mwmechanics/alchemy.hpp b/apps/openmw/mwmechanics/alchemy.hpp
index c96356ebb..caba26f14 100644
--- a/apps/openmw/mwmechanics/alchemy.hpp
+++ b/apps/openmw/mwmechanics/alchemy.hpp
@@ -109,6 +109,9 @@ namespace MWMechanics
             void removeIngredient (int index);
             ///< Remove ingredient from slot (calling this function on an empty slot is a no-op).
 
+            std::string suggestPotionName ();
+            ///< Suggest a name for the potion, based on the current effects
+
             Result create (const std::string& name);
             ///< Try to create a potion from the ingredients, place it in the inventory of the alchemist and
             /// adjust the skills of the alchemist accordingly.