From c0c1db44907a4719773c7f734fefeb599a32eeda Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 10 Jun 2014 03:28:21 +0200
Subject: [PATCH] Don't list non-usable items in QuickKeysMenu selection (Fixes
 #1427)

---
 apps/openmw/mwgui/quickkeysmenu.cpp       | 2 ++
 apps/openmw/mwgui/sortfilteritemmodel.cpp | 5 +++++
 apps/openmw/mwgui/sortfilteritemmodel.hpp | 1 +
 3 files changed, 8 insertions(+)

diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index eda9daeffe..f52a4b9413 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -24,6 +24,7 @@
 #include "spellwindow.hpp"
 
 #include "itemwidget.hpp"
+#include "sortfilteritemmodel.hpp"
 
 
 namespace MWGui
@@ -134,6 +135,7 @@ namespace MWGui
         }
         mItemSelectionDialog->setVisible(true);
         mItemSelectionDialog->openContainer(MWBase::Environment::get().getWorld()->getPlayerPtr());
+        mItemSelectionDialog->setFilter(SortFilterItemModel::Filter_OnlyUsableItems);
 
         mAssignDialog->setVisible (false);
     }
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index b8dcbcbbb1..93e5432ca9 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -14,6 +14,7 @@
 #include <components/esm/loadweap.hpp>
 
 #include "../mwworld/class.hpp"
+#include "../mwworld/nullaction.hpp"
 
 namespace
 {
@@ -126,6 +127,10 @@ namespace MWGui
                 && !base.get<ESM::Book>()->mBase->mData.mIsScroll)
             return false;
 
+        if ((mFilter & Filter_OnlyUsableItems) && typeid(*base.getClass().use(base)) == typeid(MWWorld::NullAction)
+                && base.getClass().getScript(base).empty())
+            return false;
+
         return true;
     }
 
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.hpp b/apps/openmw/mwgui/sortfilteritemmodel.hpp
index c7feaa3b92..4af35e7a8b 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.hpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.hpp
@@ -36,6 +36,7 @@ namespace MWGui
         static const int Filter_OnlyEnchanted = (1<<1);
         static const int Filter_OnlyEnchantable = (1<<2);
         static const int Filter_OnlyChargedSoulstones = (1<<3);
+        static const int Filter_OnlyUsableItems = (1<<4); // Only items with a Use action
 
 
     private: