From 6d62aa754445931fad3d7e5bc7389f8b6e6ccc36 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 18 Feb 2015 19:06:36 +0100
Subject: [PATCH] Don't prompt for spell deletion when using cycling keys
 (Fixes #2382)

---
 apps/openmw/mwgui/spellwindow.cpp | 71 +++++++++++++++++--------------
 apps/openmw/mwgui/spellwindow.hpp |  1 +
 2 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index 69365c108..cc032691e 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -102,52 +102,53 @@ namespace MWGui
         updateSpells();
     }
 
-    void SpellWindow::onModelIndexSelected(SpellModel::ModelIndex index)
+    void SpellWindow::askDeleteSpell(const std::string &spellId)
     {
-        const Spell& spell = mSpellView->getModel()->getItem(index);
-        if (spell.mType == Spell::Type_EnchantedItem)
+        // delete spell, if allowed
+        const ESM::Spell* spell =
+            MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(spellId);
+
+        if (spell->mData.mFlags & ESM::Spell::F_Always
+            || spell->mData.mType == ESM::Spell::ST_Power)
         {
-            onEnchantedItemSelected(spell.mItem, spell.mActive);
+            MWBase::Environment::get().getWindowManager()->messageBox("#{sDeleteSpellError}");
         }
         else
         {
-            onSpellSelected(spell.mId);
+            // ask for confirmation
+            mSpellToDelete = spellId;
+            ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
+            std::string question = MWBase::Environment::get().getWindowManager()->getGameSettingString("sQuestionDeleteSpell", "Delete %s?");
+            question = boost::str(boost::format(question) % spell->mName);
+            dialog->open(question);
+            dialog->eventOkClicked.clear();
+            dialog->eventOkClicked += MyGUI::newDelegate(this, &SpellWindow::onDeleteSpellAccept);
+            dialog->eventCancelClicked.clear();
         }
     }
 
-    void SpellWindow::onSpellSelected(const std::string& spellId)
+    void SpellWindow::onModelIndexSelected(SpellModel::ModelIndex index)
     {
-        if (MyGUI::InputManager::getInstance().isShiftPressed())
+        const Spell& spell = mSpellView->getModel()->getItem(index);
+        if (spell.mType == Spell::Type_EnchantedItem)
         {
-            // delete spell, if allowed
-            const ESM::Spell* spell =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(spellId);
-
-            if (spell->mData.mFlags & ESM::Spell::F_Always
-                || spell->mData.mType == ESM::Spell::ST_Power)
-            {
-                MWBase::Environment::get().getWindowManager()->messageBox("#{sDeleteSpellError}");
-            }
-            else
-            {
-                // ask for confirmation
-                mSpellToDelete = spellId;
-                ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
-                std::string question = MWBase::Environment::get().getWindowManager()->getGameSettingString("sQuestionDeleteSpell", "Delete %s?");
-                question = boost::str(boost::format(question) % spell->mName);
-                dialog->open(question);
-                dialog->eventOkClicked.clear();
-                dialog->eventOkClicked += MyGUI::newDelegate(this, &SpellWindow::onDeleteSpellAccept);
-                dialog->eventCancelClicked.clear();
-            }
+            onEnchantedItemSelected(spell.mItem, spell.mActive);
         }
         else
         {
-            MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-            MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
-            store.setSelectedEnchantItem(store.end());
-            MWBase::Environment::get().getWindowManager()->setSelectedSpell(spellId, int(MWMechanics::getSpellSuccessChance(spellId, player)));
+            if (MyGUI::InputManager::getInstance().isShiftPressed())
+                askDeleteSpell(spell.mId);
+            else
+                onSpellSelected(spell.mId);
         }
+    }
+
+    void SpellWindow::onSpellSelected(const std::string& spellId)
+    {
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+        MWWorld::InventoryStore& store = player.getClass().getInventoryStore(player);
+        store.setSelectedEnchantItem(store.end());
+        MWBase::Environment::get().getWindowManager()->setSelectedSpell(spellId, int(MWMechanics::getSpellSuccessChance(spellId, player)));
 
         updateSpells();
     }
@@ -184,6 +185,10 @@ namespace MWGui
             return;
         selected = (selected + itemcount) % itemcount;
 
-        onModelIndexSelected(selected);
+        const Spell& spell = mSpellView->getModel()->getItem(selected);
+        if (spell.mType == Spell::Type_EnchantedItem)
+            onEnchantedItemSelected(spell.mItem, spell.mActive);
+        else
+            onSpellSelected(spell.mId);
     }
 }
diff --git a/apps/openmw/mwgui/spellwindow.hpp b/apps/openmw/mwgui/spellwindow.hpp
index 650218d30..8b5474f58 100644
--- a/apps/openmw/mwgui/spellwindow.hpp
+++ b/apps/openmw/mwgui/spellwindow.hpp
@@ -33,6 +33,7 @@ namespace MWGui
         void onSpellSelected(const std::string& spellId);
         void onModelIndexSelected(SpellModel::ModelIndex index);
         void onDeleteSpellAccept();
+        void askDeleteSpell(const std::string& spellId);
 
         virtual void onPinToggled();
         virtual void onTitleDoubleClicked();