summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/delay.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-31 23:33:49 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-05-31 23:33:49 +0000
commitb2a0f789b94558ed467b25ac5355eaf8b6558077 (patch)
tree8ffec1f322123a7ab8b725dcc4c23cbfa40e95f5 /crawl-ref/source/delay.cc
parent3344142e8b26c115585389049ca3a7f535fcab75 (diff)
downloadcrawl-ref-b2a0f789b94558ed467b25ac5355eaf8b6558077.tar.gz
crawl-ref-b2a0f789b94558ed467b25ac5355eaf8b6558077.zip
Fix 1962147: Move the comments on the food you eat at the end of DELAY_EAT.
Fix 1971216: Kills by confused undead use LIVING_KILLED_BY_SERVANT instead because the message ("collateral kill") fits better and, though it's basically a hack, the distinction does fit somehow. Fix 1914948: Tweak message when you resist a spell cast by an invisible monster. Fix 1946608: Print "Nothing appears to happen." if reading ?EWI when unarmed. I guess that's it, plus probably some more cleanup. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5378 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
-rw-r--r--crawl-ref/source/delay.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 6df2378d7c..8c330e141d 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -988,9 +988,11 @@ static void finish_delay(const delay_queue_item &delay)
case DELAY_EAT:
mprf("You finish eating.");
// For chunks, warn the player if they're not getting much
- // nutrition.
+ // nutrition. Also, print the other eating messages only now.
if (delay.parm1)
chunk_nutrition_message(delay.parm1);
+ else if (delay.parm2 != -1)
+ finished_eating_message(delay.parm2);
break;
case DELAY_FEED_VAMPIRE: