summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/delay.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-19 19:10:59 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-19 19:10:59 +0000
commitdbea6550fa584e710e7788b95f1037a9ec344ba5 (patch)
tree0d12ae05951ab2a52d3fee8c010a53f316c34bf5 /crawl-ref/source/delay.cc
parent7a384021ca6d8be5bf1d846e349364c3e54f575a (diff)
downloadcrawl-ref-dbea6550fa584e710e7788b95f1037a9ec344ba5.tar.gz
crawl-ref-dbea6550fa584e710e7788b95f1037a9ec344ba5.zip
Add minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9518 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/delay.cc')
-rw-r--r--crawl-ref/source/delay.cc41
1 files changed, 22 insertions, 19 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index a59c31285f..11ce010c47 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -414,20 +414,21 @@ void stop_delay( bool stop_stair_travel )
case DELAY_MEMORISE:
// Losing work here is okay... having to start from
// scratch is a reasonable behaviour. -- bwr
- mpr( "Your memorisation is interrupted." );
+ mpr("Your memorisation is interrupted.");
_pop_delay();
break;
case DELAY_MULTIDROP:
// No work lost
if (!items_for_multidrop.empty())
- mpr( "You stop dropping stuff." );
+ mpr("You stop dropping stuff.");
_pop_delay();
break;
case DELAY_RECITE:
mprf(MSGCH_PLAIN, "You stop %s.",
- _get_recite_speech("other", you.num_turns + delay.duration).c_str());
+ _get_recite_speech("other",
+ you.num_turns + delay.duration).c_str());
_pop_delay();
break;
@@ -465,21 +466,22 @@ void stop_delay( bool stop_stair_travel )
case DELAY_FEED_VAMPIRE:
{
mpr("You stop draining the corpse.");
+
+ did_god_conduct(DID_DRINK_BLOOD, 8);
+
_xom_check_corpse_waste();
- item_def &corpse = (delay.parm1 ? you.inv[delay.parm2]
- : mitm[delay.parm2]);
+ item_def &item = (delay.parm1 ? you.inv[delay.parm2]
+ : mitm[delay.parm2]);
- const bool was_orc = (mons_species(corpse.plus) == MONS_ORC);
+ const bool was_orc = (mons_species(item.plus) == MONS_ORC);
mpr("All blood oozes out of the corpse!");
- did_god_conduct(DID_DRINK_BLOOD, 8);
-
- bleed_onto_floor(you.pos(), corpse.plus, delay.duration, false);
+ bleed_onto_floor(you.pos(), item.plus, delay.duration, false);
- if (mons_skeleton(corpse.plus) && one_chance_in(3))
- turn_corpse_into_skeleton(corpse);
+ if (mons_skeleton(item.plus) && one_chance_in(3))
+ turn_corpse_into_skeleton(item);
else
{
if (delay.parm1)
@@ -496,6 +498,7 @@ void stop_delay( bool stop_stair_travel )
handle_delay();
return;
}
+
case DELAY_ARMOUR_ON:
case DELAY_ARMOUR_OFF:
// These two have the default action of not being interruptible,
@@ -511,14 +514,14 @@ void stop_delay( bool stop_stair_travel )
case DELAY_ASCENDING_STAIRS: // short... and probably what people want
case DELAY_DESCENDING_STAIRS: // short... and probably what people want
- if (stop_stair_travel)
- {
- mprf("You stop %s the stairs.",
- delay.type == DELAY_ASCENDING_STAIRS ? "ascending"
- : "descending");
- _pop_delay();
- }
- break;
+ if (stop_stair_travel)
+ {
+ mprf("You stop %s the stairs.",
+ delay.type == DELAY_ASCENDING_STAIRS ? "ascending"
+ : "descending");
+ _pop_delay();
+ }
+ break;
case DELAY_WEAPON_SWAP: // one turn... too much trouble
case DELAY_DROP_ITEM: // one turn... only used for easy armour drops