From 014ab7e33a12d7ac74988514e88c6542005f57c8 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Sat, 14 Jun 2008 10:15:25 +0000 Subject: Fix bug where dumping the character to file would turn off note taking for the rest of the game session. Make a note if the user starts the game in wizard mode, when wizard mode is entered, and when death is escaped via wizard mode. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5812 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/ouch.cc | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'crawl-ref/source/ouch.cc') diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index cadb9b8372..e722c8169f 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -875,6 +875,9 @@ void ouch( int dam, int death_source, kill_method_type death_type, } // else hp <= 0 } + // construct scorefile entry. + scorefile_entry se(dam, death_source, death_type, aux); + #ifdef WIZARD if (death_type != KILLED_BY_QUITTING && death_type != KILLED_BY_WINNING @@ -882,6 +885,8 @@ void ouch( int dam, int death_source, kill_method_type death_type, { if (you.wizard) { + const std::string death_desc + = se.death_description(scorefile_entry::DDV_VERBOSE); #ifdef USE_OPTIONAL_WIZARD_DEATH #if DEBUG_DIAGNOSTICS @@ -890,6 +895,8 @@ void ouch( int dam, int death_source, kill_method_type death_type, if (!yesno("Die?", false, 'n')) { + take_note(Note( NOTE_DEATH, you.hp, you.hp_max, + death_desc.c_str()), true); set_hp(you.hp_max, false); return; } @@ -897,6 +904,8 @@ void ouch( int dam, int death_source, kill_method_type death_type, mpr("Since you're a debugger, I'll let you live."); mpr("Be more careful next time, okay?"); + take_note(Note( NOTE_DEATH, you.hp, you.hp_max, + death_desc.c_str()), true); set_hp(you.hp_max, false); return; #endif // USE_OPTIONAL_WIZARD_DEATH @@ -909,17 +918,13 @@ void ouch( int dam, int death_source, kill_method_type death_type, crawl_state.need_save = false; crawl_state.updating_scores = true; - take_note( - Note( NOTE_DEATH, you.hp, you.hp_max, - scorefile_entry(dam, death_source, death_type, aux) - .death_description(scorefile_entry::DDV_NORMAL).c_str()), true ); + take_note(Note( NOTE_DEATH, you.hp, you.hp_max, + se.death_description(scorefile_entry::DDV_NORMAL).c_str()), + true); // prevent bogus notes activate_notes(false); - // construct scorefile entry. - scorefile_entry se(dam, death_source, death_type, aux); - #ifdef SCORE_WIZARD_CHARACTERS // add this highscore to the score file. hiscores_new_entry(se); -- cgit v1.2.3-54-g00ecf