summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-20 19:14:25 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-20 19:14:25 +0000
commit9edc73ee928aa1299d9716bd4812db1d6c7aaa8c (patch)
tree36a4fe8f04755cf5b6570d9127f1b1f46de29326 /crawl-ref
parent66d7b7183c339a4f0e5c05c1126e7404f66548d5 (diff)
downloadcrawl-ref-9edc73ee928aa1299d9716bd4812db1d6c7aaa8c.tar.gz
crawl-ref-9edc73ee928aa1299d9716bd4812db1d6c7aaa8c.zip
Fix porridge having menu colour yellow for Mummies.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10357 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/directn.cc2
-rw-r--r--crawl-ref/source/food.cc8
2 files changed, 9 insertions, 1 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index bf16ea1fbd..9fd43d7dbc 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -3130,7 +3130,7 @@ static std::string _get_monster_desc(const monsters *mon)
text += pronoun + " is looking in ";
std::string name = foe->atype() == ACT_PLAYER
? "your" : (foe->name(DESC_NOCAP_THE) + "'s");
- text += name + "general direction.\n";
+ text += name + " general direction.\n";
}
}
else if (!foe || mons_is_fleeing(mon))
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index d8f9e66798..f6b33c0e36 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -2439,6 +2439,10 @@ static int _player_likes_food_type(int type)
// be eaten (respecting species and mutations set).
bool is_inedible(const item_def &item)
{
+ // Mummies don't eat.
+ if (you.is_undead == US_UNDEAD)
+ return (true);
+
if (food_is_rotten(item)
&& !player_mutation_level(MUT_SAPROVOROUS))
{
@@ -2466,6 +2470,10 @@ bool is_inedible(const item_def &item)
// still be edible or even delicious.
bool is_preferred_food(const item_def &food)
{
+ // Mummies don't eat.
+ if (you.is_undead == US_UNDEAD)
+ return (false);
+
// Vampires don't really have a preferred food type, but they really
// like blood potions.
if (you.species == SP_VAMPIRE)