From a0fc101bb8397b81ccd9cf5c1137764e14c57e89 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 21 Sep 2007 15:16:15 +0000 Subject: Fixed note taking (NOTE_HP_CHANGE) for invisible monsters (bug 1786776) and in general (wasn't working). Also tweaked tutorial message on burning spellbooks (Bug 1799350). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2174 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/ouch.cc | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'crawl-ref/source/ouch.cc') diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index ed81b0e3bf..b388b4e500 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -732,7 +732,7 @@ static void xom_checks_damage(kill_method_type death_type, // death_source should be set to zero for non-monsters {dlb} void ouch( int dam, int death_source, kill_method_type death_type, - const char *aux ) + const char *aux, bool see_source ) { ait_hp_loss hpl(dam, death_type); interrupt_activity( AI_HP_LOSS, &hpl ); @@ -797,18 +797,25 @@ void ouch( int dam, int death_source, kill_method_type death_type, } xom_checks_damage(death_type, dam, death_source); - return; - } - - take_note( - Note( - NOTE_HP_CHANGE, - you.hp, - you.hp_max, - scorefile_entry(dam, death_source, death_type, aux, true) - .death_description(scorefile_entry::DDV_TERSE) - .c_str()) ); + // for note taking + std::string damage_desc = ""; + if (!see_source) + { + snprintf(info, INFO_SIZE, "something (%d)", dam); + damage_desc = info; + } + else + { + damage_desc = scorefile_entry(dam, death_source, death_type, aux, true) + .death_description(scorefile_entry::DDV_TERSE); + } + + take_note( + Note(NOTE_HP_CHANGE, you.hp, you.hp_max, damage_desc.c_str()) ); + + return; + } // else hp <= 0 } #ifdef WIZARD -- cgit v1.2.3-54-g00ecf