diff options
| author | Neil Moore <neil@s-z.org> | 2014-08-05 12:05:57 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-08-05 12:09:47 -0400 |
| commit | 3cd7026de2233f047d6267521220017d64d06ff4 (patch) | |
| tree | feadbc09d335f3bf005375d02b61d3d09f034742 | |
| parent | 4841e6f1746505fdd15530e72e3ce314577647f1 (diff) | |
| download | crawl-ref-3cd7026de2233f047d6267521220017d64d06ff4.tar.gz crawl-ref-3cd7026de2233f047d6267521220017d64d06ff4.zip | |
Make food autopickup match the \ menu (Kvaak)
0.16-a0-31-g61f7dd9 changed the menu, but the actual autopickup
determination still collapsed the subtypes (so bread rations were
actually controlled by the royal jelly setting).
| -rw-r--r-- | crawl-ref/source/items.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index eab57f83ad..7899315366 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -2646,11 +2646,6 @@ static int _autopickup_subtype(const item_def &item) case OBJ_POTIONS: case OBJ_STAVES: return item_type_known(item) ? item.sub_type : max_type; - case OBJ_FOOD: - return (item.sub_type == FOOD_CHUNK) ? item.sub_type - : food_is_meaty(item) ? FOOD_MEAT_RATION - : is_fruit(item) ? FOOD_FRUIT - : FOOD_ROYAL_JELLY; case OBJ_MISCELLANY: return (item.sub_type == MISC_RUNE_OF_ZOT) ? item.sub_type : max_type; case OBJ_BOOKS: |