From 49d9c0524d203581056e6d06444bb6f6fac657f9 Mon Sep 17 00:00:00 2001
From: Matt Mills <alpha.dev@gmail.com>
Date: Wed, 8 Dec 2010 19:21:03 +0000
Subject: [PATCH] Address cull_identical_items() and find_thing() issues, fixing #1402 and #2167

---
 crawl-ref/source/shopping.cc |   88 +++++++++++++++++++++---------------------
 1 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index b5f1684..47e4f44 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -2459,63 +2459,66 @@ unsigned int ShoppingList::cull_identical_items(const item_def& item,
 
         const level_pos list_pos = thing_pos(thing);
 
-        // cost = -1, we just found a shop item which is cheaper than
-        // one on the shopping list.
-        if (cost != -1)
+        if (on_list)
         {
-            int list_cost = thing_cost(thing);
+            // cost != -1, we just found a shop item which is cheaper than
+            // one on the shopping list.
+            if (cost != -1)
+            {
+                int list_cost = thing_cost(thing);
 
-            if (cost >= list_cost)
-                continue;
+                if (cost >= list_cost)
+                    continue;
 
-            // Only prompt once.
-            if (thing.exists(REPLACE_PROMPTED_KEY))
-                continue;
-            thing[REPLACE_PROMPTED_KEY] = (bool) true;
+                // Only prompt once.
+                if (thing.exists(REPLACE_PROMPTED_KEY))
+                    continue;
+                thing[REPLACE_PROMPTED_KEY] = (bool) true;
 
-            std::string prompt =
-                make_stringf("Shopping-list: replace %dgp %s with cheaper "
-                             "one? (Y/n)", list_cost,
-                             describe_thing(thing).c_str());
+                std::string prompt =
+                    make_stringf("Shopping-list: replace %dgp %s with cheaper "
+                                 "one? (Y/n)", list_cost,
+                                 describe_thing(thing).c_str());
 
-            if (_shop_yesno(prompt.c_str(), 'y'))
-            {
-                add_item = true;
-                to_del.push_back(list_pos);
+                if (_shop_yesno(prompt.c_str(), 'y'))
+                {
+                    add_item = true;
+                    to_del.push_back(list_pos);
+                }
+                continue;
             }
-            continue;
-        }
 
-        // cost == -1, we just got an item which is on the shopping list.
-        if (do_prompt)
-        {
-            // Only prompt once.
-            if (thing.exists(REMOVE_PROMPTED_KEY))
-                continue;
-            thing[REMOVE_PROMPTED_KEY] = (bool) true;
+            // cost == -1, we just got an item which is on the shopping list.
+            if (do_prompt)
+            {
+                // Only prompt once.
+                if (thing.exists(REMOVE_PROMPTED_KEY))
+                    continue;
+                thing[REMOVE_PROMPTED_KEY] = (bool) true;
 
-            std::string prompt =
-                make_stringf("Shopping-list: remove %s? (Y/n)",
-                             describe_thing(thing, DESC_NOCAP_A).c_str());
+                std::string prompt =
+                    make_stringf("Shopping-list: remove %s? (Y/n)",
+                                 describe_thing(thing, DESC_NOCAP_A).c_str());
 
-            if (_shop_yesno(prompt.c_str(), 'y'))
-                to_del.push_back(list_pos);
-        }
-        else
-        {
-            std::string str =
-                make_stringf("Shopping-list: removing %s",
-                             describe_thing(thing, DESC_NOCAP_A).c_str());
+                if (_shop_yesno(prompt.c_str(), 'y'))
+                    to_del.push_back(list_pos);
+            }
+            else
+            {
+                std::string str =
+                    make_stringf("Shopping-list: removing %s",
+                                 describe_thing(thing, DESC_NOCAP_A).c_str());
 
-            _shop_mpr(str.c_str());
-            to_del.push_back(list_pos);
+                _shop_mpr(str.c_str());
+                to_del.push_back(list_pos);
+            }
         }
     }
 
     for (unsigned int i = 0; i < to_del.size(); i++)
         del_thing(item, &to_del[i]);
 
-    if (add_item && !on_list)
+    if (add_item)
         add_thing(item, cost);
 
     return (to_del.size());
@@ -2870,9 +2873,6 @@ int ShoppingList::find_thing(const item_def &item,
         const CrawlHashTable &thing = (*list)[i];
         const level_pos       _pos  = thing_pos(thing);
 
-        if (pos != _pos)
-            continue;
-
         if (!thing_is_item(thing))
             continue;
 
-- 
1.7.3.3