summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/options.h
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-07-02 12:26:05 -0400
committerShmuale Mark <shm.mark@gmail.com>2014-07-02 12:40:01 -0400
commita39764ffcd1b290f1a1f0f961fbd1febff85f281 (patch)
tree075d759c76b5509b9838958b7a01bc1dff39afb1 /crawl-ref/source/options.h
parent91e915e0b4b269feb16672ad98aff3c3ced93a0a (diff)
downloadcrawl-ref-a39764ffcd1b290f1a1f0f961fbd1febff85f281.tar.gz
crawl-ref-a39764ffcd1b290f1a1f0f961fbd1febff85f281.zip
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.
Diffstat (limited to 'crawl-ref/source/options.h')
-rw-r--r--crawl-ref/source/options.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/crawl-ref/source/options.h b/crawl-ref/source/options.h
index 1bf627ed13..f87540a48f 100644
--- a/crawl-ref/source/options.h
+++ b/crawl-ref/source/options.h
@@ -327,7 +327,6 @@ public:
// Order of sections in the character dump.
vector<string> dump_order;
- bool pickup_menu; // false for single, true for menu
int pickup_menu_limit; // Over this number of items, menu for
// pickup
bool easy_exit_menu; // Menus are easier to get out of