fiddlerwoaroof/crawl - Change RCU52DRCPWJVQ6HME4QR6V6EVQWTBKZTPWDI47UGUDAUBPOO5YNAC

Tutorial tweaks:

Fixed status display commentary wiping out the status display on curses.
Fixed doubled %% on Unix (a plague on whoever wrote cprintf() in libw32c.cc).
Fixed reference to get_number_of_cols() before curses initialisation.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1073 c06c8d41-db1a-0410-9941-cceddc491573

Created by dshaligram on March 20, 2007

RCU52DRCPWJVQ6HME4QR6V6EVQWTBKZTPWDI47UGUDAUBPOO5YNAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 25 [4.5936]

B:BD[3.1676] → [2.14:82]

int COLS = (get_number_of_cols() > 80) ? 80 : get_number_of_cols();

[3.1676]

[3.1709]

static int get_tutorial_cols()
{
    int ncols = get_number_of_cols();
    return (ncols > 80? 80 : ncols);
}

Replacement in crawl-ref/source/tutorial.cc at line 356 [4.5936]
B:BD[3.11869] → [3.11869:11910]
```
    int i = COLS/2-1 - strlen(info) / 2;
```
[3.11869]
[3.11910]
```
    int i = get_tutorial_cols()/2-1 - strlen(info) / 2;
```

Replacement in crawl-ref/source/tutorial.cc at line 370 [4.5936]

B:BD[3.12309] → [3.12309:12355]

        if (strlen(info) >= COLS/2 || lbreak)

[3.12309]

[3.12355]

        if (strlen(info) >= get_tutorial_cols()/2 || lbreak)

Replacement in crawl-ref/source/tutorial.cc at line 377 [4.5936]

B:BD[3.12453] → [3.12453:12518]

            result += std::string(COLS/2-1 - strlen(info), ' ');

[3.12453]

[3.12518]

            result += std::string(get_tutorial_cols()/2-1 - strlen(info), ' ');

Replacement in crawl-ref/source/tutorial.cc at line 409 [4.5936]
B:BD[3.13548] → [3.13548:13584]
```
    linebreak_string2(result,COLS);
```
[3.13548]
[3.13584]
```
    linebreak_string2(result,get_tutorial_cols());
```

Replacement in crawl-ref/source/tutorial.cc at line 418 [4.5936]

B:BD[3.13739] → [3.13739:14001]

    result += "To the right, important properties of " EOL;
    result += "the character are displayed. The most " EOL;
    result += "basic one is your health, measured as " EOL;
    snprintf(info, INFO_SIZE, "<white>HP: %d/%d<magenta>. ", you.hp, you.hp_max);

[3.13739]

[3.14001]

    result += "To the right, important properties of \n";
    result += "the character are displayed. The most \n";
    result += "basic one is your health, measured as \n";
    snprintf(info, INFO_SIZE, "<white>HP: %d/%d<magenta>. ",
             you.hp, you.hp_max);

Replacement in crawl-ref/source/tutorial.cc at line 426 [4.5936]

B:BD[3.14093] → [3.14093:14262]

    result += "These are your current out " EOL;
    result += "of maximum health points. When health " EOL;
    result += "drops to zero, you die.               " EOL;

[3.14093]

[3.14262]

    result += "These are your current out \n";
    result += "of maximum health points. When health \n";
    result += "drops to zero, you die.               \n";

Replacement in crawl-ref/source/tutorial.cc at line 431 [4.5936]

B:BD[3.14386] → [3.14386:14844]

    result += " is your energy for casting " EOL;
    result += "spells, although more mundane actions " EOL;
    result += "often draw from Magic, too.           " EOL;
    result += "Further down, <white>Str<magenta>ength, <white>Dex<magenta>terity and " EOL;
    result += "<white>Int<magenta>elligence are shown and provide an " EOL;
    result += "all-around account of the character's " EOL;
    result += "attributes.                           " EOL;

[3.14386]

[3.14844]

    result += " is your energy for casting \n";
    result += "spells, although more mundane actions \n";
    result += "often draw from Magic, too.           \n";
    result += "Further down, <white>Str<magenta>ength, <white>Dex<magenta>terity and \n";
    result += "<white>Int<magenta>elligence are shown and provide an \n";
    result += "all-around account of the character's \n";
    result += "attributes.                           \n";

Replacement in crawl-ref/source/tutorial.cc at line 439 [4.5936]

B:BD[3.14845] → [3.14845:15161]

    result += "</magenta>";
    result += "                                      " EOL;
    result += " --more--                               Press <white>Escape</white> to skip the basics" EOL;
    result += "                                      " EOL;
    result += "                                      " EOL;

[3.14845]

[3.15161]

    result += "<lightgrey>";
    result += "                                      \n";
    result += " --more--                               Press <white>Escape</white> to skip the basics\n";
    result += "                                      \n";
    result += "                                      \n";

Replacement in crawl-ref/source/tutorial.cc at line 445 [4.5936]

B:BD[3.15162] → [3.15162:15213]

    return formatted_string::parse_string(result);

[3.15162]

[3.15213]

    return formatted_string::parse_block(result, false);

Replacement in crawl-ref/source/tutorial.cc at line 460 [4.5936]
B:BD[3.15728] → [3.15728:15764]
```
    linebreak_string2(result,COLS);
```
[3.15728]
[3.15764]
```
    linebreak_string2(result,get_tutorial_cols());
```

Replacement in crawl-ref/source/tutorial.cc at line 472 [4.5936]

B:BD[3.16289] → [3.16289:16348]

    print_formatted_paragraph(text, COLS, MSGCH_TUTORIAL);

[3.16289]

[3.16348]

    mesclr();
    print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL);

Replacement in crawl-ref/source/tutorial.cc at line 490 [4.5936]

B:BD[3.16597] → [3.16597:16644]

        x2 = COLS; y2 = get_number_of_lines();

[3.16597]

[3.16644]

        x2 = get_tutorial_cols(); y2 = get_number_of_lines();

Replacement in crawl-ref/source/tutorial.cc at line 613 [4.5936]

B:BD[3.21265] → [3.21265:21324]

    print_formatted_paragraph(text, COLS, MSGCH_TUTORIAL);

[3.21265]

[3.21324]

    print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL);

Replacement in crawl-ref/source/tutorial.cc at line 633 [4.5936]

B:BD[3.21964] → [3.21964:22023]

    print_formatted_paragraph(text, COLS, MSGCH_TUTORIAL);

[3.21964]

[3.22023]

    print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL);

Replacement in crawl-ref/source/tutorial.cc at line 691 [4.5936]

B:BD[3.24897] → [3.24897:24956]

    print_formatted_paragraph(text, COLS, MSGCH_TUTORIAL);

[3.24897]

[3.24956]

    print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL);

Replacement in crawl-ref/source/tutorial.cc at line 714 [4.5936]

B:BD[3.25640] → [3.25640:25703]

        print_formatted_paragraph(text, COLS, MSGCH_TUTORIAL);

[3.25640]

[3.25703]

        print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL);

Replacement in crawl-ref/source/tutorial.cc at line 739 [4.5936]

B:BD[3.26528] → [3.26528:26595]

            print_formatted_paragraph(text, COLS, MSGCH_TUTORIAL);

[3.26528]

[3.26595]

            print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL);

Replacement in crawl-ref/source/tutorial.cc at line 868 [4.5936]
∅:D[2.2117] → [3.28729:28788]
B:BD[3.28729] → [3.28729:28788]
```
    print_formatted_paragraph(text, COLS, MSGCH_TUTORIAL);
```
[2.2117]
[3.28788]
```
    print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL);
```

Replacement in crawl-ref/source/tutorial.cc at line 881 [4.5936]

B:BD[3.29403] → [3.29403:29466]

        print_formatted_paragraph(text, COLS, MSGCH_TUTORIAL);

[3.29403]

[3.29466]

        print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL);

Replacement in crawl-ref/source/tutorial.cc at line 893 [4.5936]

B:BD[3.30094] → [3.30094:30157]

        print_formatted_paragraph(text, COLS, MSGCH_TUTORIAL);

[3.30094]

[3.30157]

        print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL);

Replacement in crawl-ref/source/tutorial.cc at line 914 [4.5936]

B:BD[2.2396] → [2.2396:2478]

            "non-letter symbols like <w>%%?!\"=()[<magenta>. Once it is in your "

[2.2396]

[2.2478]

            "non-letter symbols like <w>%?!\"=()[<magenta>. Once it is in your "

Replacement in crawl-ref/source/tutorial.cc at line 917 [4.5936]
∅:D[2.2627] → [3.31129:31188]
B:BD[3.31129] → [3.31129:31188]
```
    print_formatted_paragraph(text, COLS, MSGCH_TUTORIAL);
```
[2.2627]
[3.31188]
```
    print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL);
```

Replacement in crawl-ref/source/tutorial.cc at line 1023 [4.5936]

B:BD[3.35642] → [3.35642:35727]

          text =  "You have picked up some food ('<w>%%<magenta>'). You can eat it "

[3.35642]

[3.35727]

          text =  "You have picked up some food ('<w>%<magenta>'). You can eat it "

Replacement in crawl-ref/source/tutorial.cc at line 1027 [4.5936]

B:BD[3.35819] → [3.35819:35902]

          text =  "You have picked up a corpse ('<w>%%<magenta>'). When a corpse "

[3.35819]

[3.35902]

          text =  "You have picked up a corpse ('<w>%<magenta>'). When a corpse "

Replacement in crawl-ref/source/tutorial.cc at line 1335 [4.5936]

B:BD[3.51556] → [3.51556:51618]

       print_formatted_paragraph(text, COLS, MSGCH_TUTORIAL);

[3.51556]

[3.51618]

       print_formatted_paragraph(text, get_tutorial_cols(), MSGCH_TUTORIAL);

Deletion in crawl-ref/source/menu.cc at line 1221 [5.261322]
B:BD[2.8428] → [2.8428:8506]
```
//            formatted_mpr( formatted_string::parse_string(text), channel );
```

Deletion in crawl-ref/source/menu.cc at line 1226 [5.261322]

B:BD[6.53057] → [2.8601:8697]

//    formatted_mpr( formatted_string::parse_string( s.substr(oldloc, loc-oldloc) ), channel );

Replacement in crawl-ref/source/libw32c.cc at line 656 [7.2476860]

B:BD[7.2488149] → [7.2488149:2488259]

      if (p[0] == '%' && p[1] == '%')
      {
         p++;
         continue;
      }
      writeChar(*p++);

[7.2488149]

[7.2488259]

       writeChar(*p++);

Insertion in crawl-ref/source/format.h at line 47 [8.242]

[8.1340]

    
    static formatted_string parse_block(
            const std::string &s,
            bool  eol_ends_format = true,
            bool (*process_tag)(const std::string &tag) = NULL );

Insertion in crawl-ref/source/format.cc at line 33 [8.2166]

[8.2773]


formatted_string formatted_string::parse_block(
        const std::string &s,
        bool  eol_ends_format,
        bool (*process)(const std::string &tag))
{
    std::vector<std::string> lines = split_string("\n", s, false, true);

Insertion in crawl-ref/source/format.cc at line 41 [8.2166]

[8.2774]

    formatted_string fs;
    for (int i = 0, size = lines.size(); i < size; ++i)
    {
        if (i)
        {
            // Artificial newline - some terms erase to eol when printing a
            // newline.
            fs.gotoxy(1, -1); // CR
            fs.movexy(0, 1);  // LF
        }
        fs += parse_string(lines[i], eol_ends_format, process);
    }
    return (fs);
}

Replacement in crawl-ref/source/format.cc at line 129 [8.2166]
B:BD[8.4645] → [8.4645:4684]
```
        if (new_colour != curr_colour)
```
[8.4645]
[8.4684]
```
        if (!currs.empty())
```
Deletion in crawl-ref/source/format.cc at line 133 [8.2166]
B:BD[8.4752] → [8.4752:4806]
```
            fs.textcolor( curr_colour = new_colour );
```
Insertion in crawl-ref/source/format.cc at line 134 [8.2166]
[8.4816]
[8.4816]
```
        fs.textcolor( curr_colour = new_colour );
```