diff options
| -rw-r--r-- | crawl-ref/source/effects.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/mpr.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spells2.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/spells2.h | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index f39421dc0b..b8cd4e72b5 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -2378,13 +2378,13 @@ void handle_time( long time_delta ) if (!you.disease) { if (you.strength < you.max_strength && one_chance_in(100)) - restore_stat(STAT_STRENGTH, 0, false); + restore_stat(STAT_STRENGTH, 0, false, true); if (you.intel < you.max_intel && one_chance_in(100)) - restore_stat(STAT_INTELLIGENCE, 0, false); + restore_stat(STAT_INTELLIGENCE, 0, false, true); if (you.dex < you.max_dex && one_chance_in(100)) - restore_stat(STAT_DEXTERITY, 0, false); + restore_stat(STAT_DEXTERITY, 0, false, true); } else { diff --git a/crawl-ref/source/mpr.h b/crawl-ref/source/mpr.h index 02772989e0..c61c5097f2 100644 --- a/crawl-ref/source/mpr.h +++ b/crawl-ref/source/mpr.h @@ -38,7 +38,7 @@ enum msg_channel_type MSGCH_MONSTER_ENCHANT,// monsters enchantments up and down MSGCH_MONSTER_DAMAGE, // monster damage reports (param is level) MSGCH_MONSTER_TARGET, // message marking the monster as a target - MSGCH_ROTTEN_MEAT, // messages about chunks/corpses becoming rotten + MSGCH_ROTTEN_MEAT, // messages about chunks/corpses becoming rotten MSGCH_EQUIPMENT, // equipment listing messages MSGCH_FLOOR_ITEMS, // like equipment, but lists of floor items MSGCH_MULTITURN_ACTION, // delayed action messages diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 783f4a92e6..ee976ad7e5 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -690,10 +690,11 @@ bool brand_weapon(brand_type which_brand, int power) } // end brand_weapon() // Restore the stat in which_stat by the amount in stat_gain, displaying -// a message if suppress_msg is false. If stat_gain is 0, restore the -// stat completely. +// a message if suppress_msg is false, and doing so in the recovery +// channel if recovery is true. If stat_gain is 0, restore the stat +// completely. bool restore_stat(unsigned char which_stat, unsigned char stat_gain, - bool suppress_msg) + bool suppress_msg, bool recovery) { bool stat_restored = false; @@ -750,7 +751,7 @@ bool restore_stat(unsigned char which_stat, unsigned char stat_gain, { msg += " returning."; if ( !suppress_msg ) - mpr(msg.c_str(), MSGCH_RECOVERY); + mpr(msg.c_str(), (recovery) ? MSGCH_RECOVERY : MSGCH_PLAIN); if (stat_gain == 0 || *ptr_stat + stat_gain > *ptr_stat_max) stat_gain = *ptr_stat_max - *ptr_stat; diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h index b5d8e8cfaf..98a969c0b1 100644 --- a/crawl-ref/source/spells2.h +++ b/crawl-ref/source/spells2.h @@ -125,7 +125,7 @@ void drain_life(int pow); * returns TRUE if a stat was restored. * *********************************************************************** */ bool restore_stat(unsigned char which_stat, unsigned char stat_gain, - bool suppress_msg); + bool suppress_msg, bool recovery = false); // last updated 24may2000 {dlb} |