summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/decks.cc2
-rw-r--r--crawl-ref/source/ouch.cc5
-rw-r--r--crawl-ref/source/ouch.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index aec8dcc13e..ac4f62d79d 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2124,7 +2124,7 @@ bool card_effect(card_type which_card, deck_rarity_type rarity,
case CARD_CURSE: curse_card(power, rarity); break;
case CARD_WARPWRIGHT: warpwright_card(power, rarity); break;
case CARD_TOMB: entomb(power); break;
- case CARD_WRAITH: drain_exp(); lose_level(); break;
+ case CARD_WRAITH: drain_exp(false); lose_level(); break;
case CARD_WRATH: godly_wrath(); break;
case CARD_SUMMON_DEMON: summon_demon_card(power, rarity); break;
case CARD_SUMMON_ANIMAL: summon_animals(random2(power/3)); break;
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index 0e819d8630..2297d3d170 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -621,7 +621,7 @@ void lose_level()
xom_is_stimulated(255);
} // end lose_level()
-void drain_exp(void)
+void drain_exp(bool announce_full)
{
int protection = player_prot_life();
@@ -635,7 +635,8 @@ void drain_exp(void)
if (protection >= 3 || you.is_undead)
{
- mpr("You fully resist.");
+ if ( announce_full )
+ mpr("You fully resist.");
return;
}
diff --git a/crawl-ref/source/ouch.h b/crawl-ref/source/ouch.h
index c1c063bdfb..6036f3f584 100644
--- a/crawl-ref/source/ouch.h
+++ b/crawl-ref/source/ouch.h
@@ -110,7 +110,7 @@ void lose_level(void);
/* ***********************************************************************
* called from: decks - fight - item_use - ouch - religion - spells
* *********************************************************************** */
-void drain_exp(void);
+void drain_exp(bool announce_full = true);
void expose_player_to_element( beam_type flavour, int strength = 0 );