Be friendlier when searching for shops.

Currently, if the player searches for "shop", the stash screen shows
a long list of items in shops, and after Orc there will be a great
deal of junk on the screen. This commit checks whether a search
only returns shops, and nothing on the floor or in shops ("shop" for
example, or "gadget"). If so, it displays the shops in one stack
by default.

1 files changed, 10 insertions, 1 deletions

diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc
index c0d2e62eb5..ad1ca9569d 100644
--- a/crawl-ref/source/stash.cc
+++ b/crawl-ref/source/stash.cc
@@ -1809,7 +1809,16 @@ void StashTracker::search_stashes()
     }
 
     bool sort_by_dist = true;
-    bool show_as_stacks = false;
+    bool show_as_stacks = true;
+    for (unsigned i = 0; i < results.size(); ++i)
+        if (!(results[i].matching_items.empty() && results[i].shop))
+        {
+            // Only split up stacks if at least one match is a
+            // non-shop (and split anyway in the case of a
+            // weapon shop and a search for "weapon").
+            show_as_stacks = false;
+            break;
+        }
     bool filter_useless = false;
     bool default_execute = true;
     while (true)