Along the lines of 1706790: the identify inventory list now only contains

items which aren't fully IDed by default.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1360 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 6 insertions, 3 deletions

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 47863dcb21..48a85aa4c2 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2622,8 +2622,9 @@ enum object_class_type                 // (unsigned char) mitm[].base_type
 
 enum object_selector
 {
-    OSEL_ANY   = -1,
-    OSEL_WIELD = -2
+    OSEL_ANY     = -1,
+    OSEL_WIELD   = -2,
+    OSEL_UNIDENT = -3
 };
 
 enum operation_types
diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc
index f2b7174405..b588b54edd 100644
--- a/crawl-ref/source/invent.cc
+++ b/crawl-ref/source/invent.cc
@@ -459,6 +459,8 @@ static bool item_class_selected(const item_def &i, int selector)
 
     switch (selector)
     {
+    case OSEL_UNIDENT:
+        return !fully_identified(i);
     case OBJ_MISSILES:
         return (itype == OBJ_MISSILES || itype == OBJ_WEAPONS);
     case OBJ_WEAPONS:
diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc
index 0a80fdde88..1a1609dbda 100644
--- a/crawl-ref/source/spells1.cc
+++ b/crawl-ref/source/spells1.cc
@@ -368,7 +368,7 @@ void identify(int power)
     do
     {
         item_slot = prompt_invent_item( "Identify which item?", MT_INVSELECT,
-                                        -1, true, true, false );
+                                        OSEL_UNIDENT, true, true, false );
         if (item_slot == PROMPT_ABORT)
         {
             canned_msg( MSG_OK );