Merge pickup_menu and pickup_menu_limit.

Since pickup_menu = true was basically identical to pickup_menu_limit =
1 (or 2, actually), there isn't much need for two separate options. The
new default for pickup_menu_limit is 1, so there is no change in the
defaults.

However, if you pickup_menu_limit is now exclusive, not inclusive. This
fixes the weirdness that 1 and 2 meant the same thing, since you can't get
a menu with only one item on it. So, if you had pickup_menu = false, there
probably is a change in behaviour.

1 files changed, 4 insertions, 5 deletions

diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 008d2c3d04..74aeb86ca2 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -1280,11 +1280,10 @@ void pickup(bool partial_quantity)
             o = mitm[o].link;
         pickup_single_item(o, partial_quantity ? 0 : mitm[o].quantity);
     }
-    else if (Options.pickup_menu
-             || Options.pickup_menu_limit
-             && num_items >= (Options.pickup_menu_limit < 0
-                              ? Options.item_stack_summary_minimum
-                              : Options.pickup_menu_limit))
+    else if (Options.pickup_menu_limit
+             && num_items > (Options.pickup_menu_limit > 0
+                             ? Options.pickup_menu_limit
+                             : Options.item_stack_summary_minimum - 1))
     {
         pickup_menu(o);
     }