diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-25 10:44:29 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-25 10:44:29 +0000 |
| commit | 4daba3ca7d412661061d913ad860c50e67aa2cda (patch) | |
| tree | 645bee1abd5493f5a364fe6be047818b34b81a68 | |
| parent | 4c3ed78b224967a731c664375d51819199188314 (diff) | |
| download | crawl-ref-4daba3ca7d412661061d913ad860c50e67aa2cda.tar.gz crawl-ref-4daba3ca7d412661061d913ad860c50e67aa2cda.zip | |
No unnecessary double messaging when drawing the Wraith.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2554 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/decks.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/ouch.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/ouch.h | 2 |
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 ); |