diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-01 06:31:25 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-01 06:31:25 +0000 |
| commit | 5a15505e527c0d7a5c370b26add9b3cb644adf50 (patch) | |
| tree | 7b1af9f52557c7a61363a690d228b512d4b9d03b /crawl-ref/source/food.cc | |
| parent | 522053ab5ef9faa39ee1ce81101d8893094b36ff (diff) | |
| download | crawl-ref-5a15505e527c0d7a5c370b26add9b3cb644adf50.tar.gz crawl-ref-5a15505e527c0d7a5c370b26add9b3cb644adf50.zip | |
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
Diffstat (limited to 'crawl-ref/source/food.cc')
| -rw-r--r-- | crawl-ref/source/food.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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); |