From 2f4c72e5d1f2a84ddc6ac24b3b4628edc4e43dc3 Mon Sep 17 00:00:00 2001 From: dolorous Date: Thu, 13 Mar 2008 17:05:38 +0000 Subject: Clean things up a bit more. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3625 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/food.cc | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'crawl-ref/source/food.cc') diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 318f59a38a..92d8f42d84 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -531,18 +531,22 @@ bool prompt_eat_from_inventory(int slot) // this conditional can later be merged into food::can_ingest() when // expanded to handle more than just OBJ_FOOD 16mar200 {dlb} - if (you.species != SP_VAMPIRE && - you.inv[which_inventory_slot].base_type != OBJ_FOOD) + if (you.species != SP_VAMPIRE) { - mpr("You can't eat that!"); - return (false); + if (you.inv[which_inventory_slot].base_type != OBJ_FOOD) + { + mpr("You can't eat that!"); + return (false); + } } - else if (you.species == SP_VAMPIRE && - (you.inv[which_inventory_slot].base_type != OBJ_CORPSES - || you.inv[which_inventory_slot].sub_type != CORPSE_BODY)) + else { - mpr("You crave blood!"); - return (false); + if (you.inv[which_inventory_slot].base_type != OBJ_CORPSES + || you.inv[which_inventory_slot].sub_type != CORPSE_BODY) + { + mpr("You crave blood!"); + return (false); + } } if (!can_ingest( you.inv[which_inventory_slot].base_type, -- cgit v1.2.3-54-g00ecf