summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-13 14:16:10 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-13 14:16:10 +0000
commitb69617baddb4476c67a2b6b1b0d6a124431125bc (patch)
treee8ec75a7ed7af3768dcadb5ecfbd0932e6e6a229
parente07087b401637fe6cfd433ffd181eb6f1a76dd43 (diff)
downloadcrawl-ref-b69617baddb4476c67a2b6b1b0d6a124431125bc.tar.gz
crawl-ref-b69617baddb4476c67a2b6b1b0d6a124431125bc.zip
Apply trunk r10205 to 0.5.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10206 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/delay.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index d570768708..17693fdc85 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -1089,9 +1089,7 @@ static void _finish_delay(const delay_queue_item &delay)
const equipment_type slot = get_armour_slot(you.inv[delay.parm1]);
if (slot == EQ_BODY_ARMOUR)
- {
you.equip[EQ_BODY_ARMOUR] = -1;
- }
else
{
switch (slot)
@@ -1116,6 +1114,7 @@ static void _finish_delay(const delay_queue_item &delay)
you.redraw_evasion = true;
break;
}
+
case DELAY_EAT:
mprf("You finish eating.");
// For chunks, warn the player if they're not getting much
@@ -1153,6 +1152,7 @@ static void _finish_delay(const delay_queue_item &delay)
did_god_conduct(DID_DESECRATE_ORCISH_REMAINS, 2);
break;
}
+
case DELAY_MEMORISE:
mpr("You finish memorising.");
add_spell_to_memory(static_cast<spell_type>(delay.parm1));