From 5a15505e527c0d7a5c370b26add9b3cb644adf50 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Sun, 1 Jun 2008 06:31:25 +0000 Subject: is_mutagenic(), is_contaminated() and causes_rot() should have been using &&, not || git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5397 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/food.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/food.cc') diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 390b9caaf8..ad84a5916b 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -1693,7 +1693,7 @@ bool is_poisonous(const item_def &food) bool is_mutagenic(const item_def &food) { - if (food.base_type != OBJ_FOOD || food.base_type != OBJ_CORPSES) + if (food.base_type != OBJ_FOOD && food.base_type != OBJ_CORPSES) return (false); return (mons_corpse_effect(food.plus) == CE_MUTAGEN_RANDOM); @@ -1701,7 +1701,7 @@ bool is_mutagenic(const item_def &food) bool is_contaminated(const item_def &food) { - if (food.base_type != OBJ_FOOD || food.base_type != OBJ_CORPSES) + if (food.base_type != OBJ_FOOD && food.base_type != OBJ_CORPSES) return (false); return (mons_corpse_effect(food.plus) == CE_CONTAMINATED); @@ -1709,7 +1709,7 @@ bool is_contaminated(const item_def &food) bool causes_rot(const item_def &food) { - if (food.base_type != OBJ_FOOD || food.sub_type != FOOD_CHUNK) + if (food.base_type != OBJ_FOOD && food.sub_type != FOOD_CHUNK) return (false); return (mons_corpse_effect(food.plus) == CE_HCL); -- cgit v1.2.3-54-g00ecf