From de3f47634db15c572abcdc67fb4856afdfa110a2 Mon Sep 17 00:00:00 2001 From: haranp Date: Sun, 1 Jul 2007 22:01:20 +0000 Subject: Tutorial condolences message shouldn't display if you escape the dungeon. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1708 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/ouch.cc | 8 ++++---- crawl-ref/source/tutorial.cc | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index 5025e419a8..705c9b3fed 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -947,11 +947,11 @@ void end_game( struct scorefile_entry &se ) if (dead) { mpr("You die..."); // insert player name here? {dlb} - viewwindow(1, false); // don't do this for leaving/winning characters - } + viewwindow(true, false); // don't do for leaving/winning characters - if (Options.tutorial_left) - tutorial_death_screen(); + if (Options.tutorial_left) + tutorial_death_screen(); + } #ifdef DGL_WHEREIS whereis_record( se.death_type == KILLED_BY_QUITTING? "quit" : diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 10ac59b00c..856360742f 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -542,7 +542,7 @@ void tutorial_death_screen() mpr( "Condolences! Your character's premature death is a sad, but " "common occurence in Crawl. Rest assured that with diligence and " - "playing experience your characters will last longer.\n", MSGCH_TUTORIAL); + "playing experience your characters will last longer.", MSGCH_TUTORIAL); mpr( "Perhaps the following advice can improve your playing style:", MSGCH_TUTORIAL); more(); @@ -692,8 +692,7 @@ void tutorial_finished() print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL); more(); - for ( long i = 0; i < TUT_EVENTS_NUM; ++i ) - Options.tutorial_events[i] = 0; + Options.tutorial_events.init(false); } // occasionally remind religious characters of praying -- cgit v1.2.3-54-g00ecf