From a524209b16c1775a7367b76aec8e570bab9ad1c9 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 30 Jun 2008 19:11:56 +0000 Subject: Don't offer the wielded weapon for quivering (even if throwable) since you can't quiver it anyway. Fix !porridge being highlighted as preferred food if unidentified. Tweak change log a bit. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6259 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/food.cc | 5 ++++- crawl-ref/source/quiver.cc | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 776ae2dbb2..02555cb734 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -1945,8 +1945,11 @@ bool is_preferred_food(const item_def &food) if (you.species == SP_VAMPIRE) return (is_blood_potion(food)); - if (food.base_type == OBJ_POTIONS && food.sub_type == POT_PORRIDGE) + if (food.base_type == OBJ_POTIONS && food.sub_type == POT_PORRIDGE + && item_type_known(food)) + { return (!player_mutation_level(MUT_CARNIVOROUS)); + } if (food.base_type != OBJ_FOOD) return (false); diff --git a/crawl-ref/source/quiver.cc b/crawl-ref/source/quiver.cc index d6e52d5f36..da0ee0305b 100644 --- a/crawl-ref/source/quiver.cc +++ b/crawl-ref/source/quiver.cc @@ -144,8 +144,8 @@ void choose_item_for_quiver() { int slot = prompt_invent_item( "Quiver which item? (- for none, * to show all)", MT_INVLIST, - OSEL_THROWABLE, true, true, true, '-', -1, - NULL, OPER_QUIVER ); + OSEL_THROWABLE, true, true, true, '-', + you.equip[EQ_WEAPON], NULL, OPER_QUIVER ); if (slot == PROMPT_ABORT) { -- cgit v1.2.3-54-g00ecf