diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-10 21:42:05 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-10 21:42:05 +0000 |
| commit | 63ade43aec4adc4a3759878b5de6765d8f07cf4a (patch) | |
| tree | ba63b1ceaa9fd8b6119d84ce6f76176d61b23a51 /crawl-ref/source/food.cc | |
| parent | 9be5f760e240035249df824060d978db37128404 (diff) | |
| download | crawl-ref-63ade43aec4adc4a3759878b5de6765d8f07cf4a.tar.gz crawl-ref-63ade43aec4adc4a3759878b5de6765d8f07cf4a.zip | |
Apply some more commits to bring 0.4 up to date.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6484 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
| -rw-r--r-- | crawl-ref/source/food.cc | 11 |
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) |