summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/food.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-10 00:29:12 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-10 00:29:12 +0000
commit9c5577d08a235b3faa539de3e372f37f03ecc2c1 (patch)
tree36a2b58961be33012b701fcecb2f149a614435cb /crawl-ref/source/food.cc
parented4dfd0a413dc247f9385bd79fc60eb345a22503 (diff)
downloadcrawl-ref-9c5577d08a235b3faa539de3e372f37f03ecc2c1.tar.gz
crawl-ref-9c5577d08a235b3faa539de3e372f37f03ecc2c1.zip
Add several complicated restrictions to the starting gods. Yes, this is
probably done in a needlessly redundant way, but I'm tired and cranky, so please do forgive me. Might be buggy, thus won't apply to 0.4 yet. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6467 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
-rw-r--r--crawl-ref/source/food.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index 210b6f50f7..0723e53728 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -582,9 +582,9 @@ bool butchery(int which_corpse)
&& god_likes_butchery(you.religion));
// We don't need to check for undead because
- // * Mummies can't eat
- // * Ghouls relish the bad things
- // * Vampires won't bottle bad corpses
+ // * Mummies can't eat.
+ // * Ghouls relish the bad things.
+ // * Vampires won't bottle bad corpses.
// Also, don't bother colouring if it's only for sacrificing.
if (!sacrifice && !you.is_undead)
{
@@ -1187,10 +1187,13 @@ int eat_from_floor()
}
found_valid = true;
+ std::string item_name = get_message_colour_tags(*si, DESC_NOCAP_A,
+ MSGCH_PROMPT);
+
mprf(MSGCH_PROMPT, "%s %s%s? (ye/n/q/i?)",
(you.species == SP_VAMPIRE ? "Drink blood from" : "Eat"),
((si->quantity > 1) ? "one of " : ""),
- si->name(DESC_NOCAP_A).c_str());
+ item_name.c_str());
int keyin = tolower(c_getch());
switch (keyin)