From a8f9c9ba637b6fbf54528548d94a0b5aa02520ce Mon Sep 17 00:00:00 2001 From: dshaligram Date: Sun, 1 Apr 2007 08:50:27 +0000 Subject: Tutorial linewrap fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1165 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/newgame.cc | 5 +++-- crawl-ref/source/tutorial.cc | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 2cd451824e..958086967a 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -2131,12 +2131,13 @@ static void enter_player_name(bool blankOK) if (existing_chars.size() == 0) { gotoxy(1,12); - cprintf(" If you've never been here before, you might want to try out\n"); + cprintf(" If you've never been here before, " + "you might want to try out" EOL); cprintf(" the Dungeon Crawl tutorial. To do this, press "); textcolor(WHITE); cprintf("T"); textcolor(LIGHTGREY); - cprintf(" on the next\n"); + cprintf(" on the next" EOL); cprintf(" screen."); } diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 9c38a90109..a9e4b2eb91 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -251,7 +251,7 @@ static formatted_string tut_starting_info(unsigned int width) result += "Press Esc to fast forward to the game start."; - return formatted_string::parse_string(result); + return formatted_string::parse_block(result); } #ifdef TUTORIAL_DEBUG @@ -408,7 +408,7 @@ static formatted_string tutorial_map_intro() result += " --more-- Press Escape to skip the basics"; linebreak_string2(result,get_tutorial_cols()); - return formatted_string::parse_string(result); + return formatted_string::parse_block(result, false); } static formatted_string tutorial_stats_intro() @@ -459,7 +459,7 @@ static formatted_string tutorial_message_intro() result += " --more-- Press Escape to skip the basics"; linebreak_string2(result,get_tutorial_cols()); - return formatted_string::parse_string(result); + return formatted_string::parse_block(result, false); } static void tutorial_movement_info() -- cgit v1.2.3-54-g00ecf