fiddlerwoaroof/crawl - Change 557IY36VX2M4ERVCP5HNI3YTHHVTHPETZ5RWDX5BKDKXXIYCFUJAC

More minor cleanups.

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

Created by haranp on June 20, 2007

557IY36VX2M4ERVCP5HNI3YTHHVTHPETZ5RWDX5BKDKXXIYCFUJAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 1031 [3.397614]
B:BD[3.423539] → [3.423539:423582]
```
        you.had_book[ book.sub_type ] = 1;
```
[3.423539]
[3.423582]
```
        you.had_book[ book.sub_type ] = true;
```

Replacement in crawl-ref/source/spl-book.cc at line 1037 [3.397614]

B:BD[3.423748] → [3.423748:423901]

            you.had_book[BOOK_MINOR_MAGIC_I] = 1;
            you.had_book[BOOK_MINOR_MAGIC_II] = 1;
            you.had_book[BOOK_MINOR_MAGIC_III] = 1;

[3.423748]

[3.423901]

            you.had_book[BOOK_MINOR_MAGIC_I] = true;
            you.had_book[BOOK_MINOR_MAGIC_II] = true;
            you.had_book[BOOK_MINOR_MAGIC_III] = true;

Replacement in crawl-ref/source/spl-book.cc at line 1044 [3.397614]

B:BD[3.424030] → [3.424030:424133]

            you.had_book[BOOK_CONJURATIONS_I] = 1;
            you.had_book[BOOK_CONJURATIONS_II] = 1;

[3.424030]

[3.424133]

            you.had_book[BOOK_CONJURATIONS_I] = true;
            you.had_book[BOOK_CONJURATIONS_II] = true;

Replacement in crawl-ref/source/mstuff2.cc at line 1980 [3.1340842]

B:BD[4.409578] → [4.409578:409668]

    if ((mons_player_visible(mons) || one_chance_in(3))
            && !one_chance_in(3))

[4.409578]

[4.409668]

    if ((mons_player_visible(mons) || one_chance_in(3)) && !one_chance_in(3))

Replacement in crawl-ref/source/mstuff2.cc at line 1982 [3.1340842]

B:BD[4.409674] → [4.409674:409739]

B:BD[4.409739] → [2.17829:17891]

        char wc[30];
        weird_colours( random2(256), wc );
        std::string msg = "'s eyes glow ";
        msg += wc;

[4.409674]

[2.17891]

        const std::string msg = "'s eyes glow " + weird_colours(random2(256));

Replacement in crawl-ref/source/monplace.h at line 69 [3.1638277]
B:BD[3.1640911] → [3.1640911:1640953]
```
int summon_any_demon( char demon_class );
```
[3.1640911]
[3.1640953]
```
int summon_any_demon( demon_class_type demon_class );
```
Replacement in crawl-ref/source/monplace.cc at line 1473 [3.1641732]
B:BD[3.1679186] → [3.1679186:1679225]
```
int summon_any_demon(char demon_class)
```
[3.1679186]
[3.1679225]
```
int summon_any_demon(demon_class_type demon_class)
```
Replacement in crawl-ref/source/misc.h at line 118 [3.1928926]
B:BD[3.1932955] → [3.1932955:1933008]
```
void weird_colours(unsigned char coll, char wc[30]);
```
[3.1932955]
[3.1933008]
```
std::string weird_colours(unsigned char coll);
```
Replacement in crawl-ref/source/misc.h at line 125 [3.1928926]
B:BD[3.1933219] → [3.1933219:1933257]
```
void weird_writing(char stringy[40]);
```
[3.1933219]
[3.1933257]
```
std::string weird_writing();
```
Replacement in crawl-ref/source/misc.cc at line 1468 [3.1933596]
B:BD[3.1974573] → [3.1974573:1974610]
```
void weird_writing(char stringy[40])
```
[3.1974573]
[3.1974610]
```
std::string weird_writing()
```

Replacement in crawl-ref/source/misc.cc at line 1470 [3.1933596]

B:BD[3.1974612] → [3.1974612:1974684]

    int temp_rand = 0;          // for probability determinations {dlb}

[3.1974612]

[3.1974684]

    int temp_rand;             // for probability determinations {dlb}
    std::string result;

Insertion in crawl-ref/source/misc.cc at line 1474 [3.1933596]

[3.1974714]

    result =
        (temp_rand == 0) ? "writhing" :
        (temp_rand == 1) ? "bold" :
        (temp_rand == 2) ? "faint" :
        (temp_rand == 3) ? "spidery" :
        (temp_rand == 4) ? "blocky" :
        (temp_rand == 5) ? "angular" :
        (temp_rand == 6) ? "shimmering" :
        (temp_rand == 7) ? "glowing"
                         : "";

Replacement in crawl-ref/source/misc.cc at line 1485 [3.1933596]

B:BD[3.1974715] → [3.1974715:1975163]

    // you'll see why later on {dlb}
    strcpy(stringy, (temp_rand == 0) ? "writhing" :
                    (temp_rand == 1) ? "bold" :
                    (temp_rand == 2) ? "faint" :
                    (temp_rand == 3) ? "spidery" :
                    (temp_rand == 4) ? "blocky" :
                    (temp_rand == 5) ? "angular" :
                    (temp_rand == 6) ? "shimmering" :
                    (temp_rand == 7) ? "glowing" : "");

[3.1974715]

[3.1975163]

    if (!result.empty())
        result += ' ';

Deletion in crawl-ref/source/misc.cc at line 1488 [3.1933596]

B:BD[3.1975164] → [3.1975164:1975253]

    if (temp_rand < 8)
        strcat(stringy, " ");   // see above for reasoning {dlb}

Replacement in crawl-ref/source/misc.cc at line 1490 [3.1933596]

B:BD[3.1975283] → [3.1975283:1976046]

    strcat(stringy, (temp_rand ==  0) ? "yellow" :
                    (temp_rand ==  1) ? "brown" :
                    (temp_rand ==  2) ? "black" :
                    (temp_rand ==  3) ? "purple" :
                    (temp_rand ==  4) ? "orange" :
                    (temp_rand ==  5) ? "lime-green" :
                    (temp_rand ==  6) ? "blue" :
                    (temp_rand ==  7) ? "grey" :
                    (temp_rand ==  8) ? "silver" :
                    (temp_rand ==  9) ? "gold" :
                    (temp_rand == 10) ? "umber" :
                    (temp_rand == 11) ? "charcoal" :
                    (temp_rand == 12) ? "pastel" :
                    (temp_rand == 13) ? "mauve"
                                      : "colourless");

[3.1975283]

[3.1976046]

    result +=
        (temp_rand ==  0) ? "yellow" :
        (temp_rand ==  1) ? "brown" :
        (temp_rand ==  2) ? "black" :
        (temp_rand ==  3) ? "purple" :
        (temp_rand ==  4) ? "orange" :
        (temp_rand ==  5) ? "lime-green" :
        (temp_rand ==  6) ? "blue" :
        (temp_rand ==  7) ? "grey" :
        (temp_rand ==  8) ? "silver" :
        (temp_rand ==  9) ? "gold" :
        (temp_rand == 10) ? "umber" :
        (temp_rand == 11) ? "charcoal" :
        (temp_rand == 12) ? "pastel" :
        (temp_rand == 13) ? "mauve"
                          : "colourless";

Replacement in crawl-ref/source/misc.cc at line 1507 [3.1933596]
B:BD[3.1976047] → [3.1976047:1976073]
```
    strcat(stringy, " ");
```
[3.1976047]
[3.1976073]
```
    result += ' ';
```

Replacement in crawl-ref/source/misc.cc at line 1511 [3.1933596]

B:BD[3.1976104] → [3.1976104:1976666]

    strcat(stringy, (temp_rand == 0) ? "writing" :
                    (temp_rand == 1) ? "scrawl" :
                    (temp_rand == 2) ? "sigils" :
                    (temp_rand == 3) ? "runes" :
                    (temp_rand == 4) ? "hieroglyphics" :
                    (temp_rand == 5) ? "scrawl" :
                    (temp_rand == 6) ? "print-out" :
                    (temp_rand == 7) ? "binary code" :
                    (temp_rand == 8) ? "glyphs" :
                    (temp_rand == 9) ? "symbols"
                                     : "text");

[3.1976104]

[3.1976666]

    result +=
        (temp_rand == 0) ? "writing" :
        (temp_rand == 1) ? "scrawl" :
        (temp_rand == 2) ? "sigils" :
        (temp_rand == 3) ? "runes" :
        (temp_rand == 4) ? "hieroglyphics" :
        (temp_rand == 5) ? "scrawl" :
        (temp_rand == 6) ? "print-out" :
        (temp_rand == 7) ? "binary code" :
        (temp_rand == 8) ? "glyphs" :
        (temp_rand == 9) ? "symbols"
                         : "text";

Replacement in crawl-ref/source/misc.cc at line 1524 [3.1933596]
B:BD[3.1976667] → [3.1976667:1976734]
```
    return;
}                               // end weird_writing()
```
[3.1976667]
[3.1976734]
```
    return result;
}
```
Replacement in crawl-ref/source/misc.cc at line 1641 [3.1933596]
B:BD[3.1979557] → [3.1979557:1979609]
```
void weird_colours(unsigned char coll, char wc[30])
```
[3.1979557]
[3.1979609]
```
std::string weird_colours(unsigned char coll)
```
Insertion in crawl-ref/source/misc.cc at line 1644 [3.1933596]
[3.1979689]
[3.1979689]
```
    std::string result;
```

Replacement in crawl-ref/source/misc.cc at line 1647 [3.1933596]

B:BD[3.1979726] → [3.1979726:1980256]

    strcpy(wc, (coll_div16 == 0 || coll_div16 ==  7) ? "brilliant" :
               (coll_div16 == 1 || coll_div16 ==  8) ? "pale" :
               (coll_div16 == 2 || coll_div16 ==  9) ? "mottled" :
               (coll_div16 == 3 || coll_div16 == 10) ? "shimmering" :
               (coll_div16 == 4 || coll_div16 == 11) ? "bright" :
               (coll_div16 == 5 || coll_div16 == 12) ? "dark" :
               (coll_div16 == 6 || coll_div16 == 13) ? "shining"
                                                     : "faint");

[3.1979726]

[3.1980256]

    result =
        (coll_div16 == 0 || coll_div16 ==  7) ? "brilliant" :
        (coll_div16 == 1 || coll_div16 ==  8) ? "pale" :
        (coll_div16 == 2 || coll_div16 ==  9) ? "mottled" :
        (coll_div16 == 3 || coll_div16 == 10) ? "shimmering" :
        (coll_div16 == 4 || coll_div16 == 11) ? "bright" :
        (coll_div16 == 5 || coll_div16 == 12) ? "dark" :
        (coll_div16 == 6 || coll_div16 == 13) ? "shining"
                                              : "faint";

Replacement in crawl-ref/source/misc.cc at line 1657 [3.1933596]
B:BD[3.1980257] → [3.1980257:1980278]
```
    strcat(wc, " ");
```
[3.1980257]
[3.1980278]
```
    result += ' ';
```

Replacement in crawl-ref/source/misc.cc at line 1662 [3.1933596]

B:BD[3.1980322] → [3.1980322:1981095]

    strcat(wc, (coll ==  0) ? "red" :
               (coll ==  1) ? "purple" :
               (coll ==  2) ? "green" :
               (coll ==  3) ? "orange" :
               (coll ==  4) ? "magenta" :
               (coll ==  5) ? "black" :
               (coll ==  6) ? "grey" :
               (coll ==  7) ? "silver" :
               (coll ==  8) ? "gold" :
               (coll ==  9) ? "pink" :
               (coll == 10) ? "yellow" :
               (coll == 11) ? "white" :
               (coll == 12) ? "brown" :
               (coll == 13) ? "aubergine" :
               (coll == 14) ? "ochre" :
               (coll == 15) ? "leaf green" :
               (coll == 16) ? "mauve" :
               (coll == 17) ? "azure"
                            : "colourless");

[3.1980322]

[3.1981095]

    result +=
        (coll ==  0) ? "red" :
        (coll ==  1) ? "purple" :
        (coll ==  2) ? "green" :
        (coll ==  3) ? "orange" :
        (coll ==  4) ? "magenta" :
        (coll ==  5) ? "black" :
        (coll ==  6) ? "grey" :
        (coll ==  7) ? "silver" :
        (coll ==  8) ? "gold" :
        (coll ==  9) ? "pink" :
        (coll == 10) ? "yellow" :
        (coll == 11) ? "white" :
        (coll == 12) ? "brown" :
        (coll == 13) ? "aubergine" :
        (coll == 14) ? "ochre" :
        (coll == 15) ? "leaf green" :
        (coll == 16) ? "mauve" :
        (coll == 17) ? "azure"
                     : "colourless";

Replacement in crawl-ref/source/misc.cc at line 1683 [3.1933596]
B:BD[3.1981096] → [3.1981096:1981163]
```
    return;
}                               // end weird_colours()
```
[3.1981096]
[3.1981163]
```
    return result;
}
```

Replacement in crawl-ref/source/mapdef.cc at line 959 [4.594797]

B:BD[5.2477] → [5.2477:2517]

    return (summon_any_demon( demon ));

[5.2477]

[4.602377]

    return (summon_any_demon( static_cast<demon_class_type>(demon) ));

Insertion in crawl-ref/source/it_use3.cc at line 801 [3.2870456]

[3.2895327]

[3.2895385]

    msg::stream << "The book opens to a page covered in "
                << weird_writing() << '.' << std::endl;

Deletion in crawl-ref/source/it_use3.cc at line 804 [3.2870456]
B:BD[3.2895386] → [6.18000:18017]
∅:D[6.18017] → [3.2895403:2895428]
B:BD[3.2895403] → [3.2895403:2895428]
B:BD[3.2895428] → [6.18018:18080]
∅:D[6.18080] → [3.2895494:2895495]
B:BD[3.2895494] → [3.2895494:2895495]
```
    char wc[40];
    weird_writing( wc );
    
    mprf("The book opens to a page covered in %s.", wc);
```
Deletion in crawl-ref/source/effects.cc at line 381 [3.3382105]
B:BD[3.3390890] → [3.3390890:3390907]
```
    char wc[30];
```

Replacement in crawl-ref/source/effects.cc at line 386 [3.3382105]

B:BD[3.3391052] → [3.3391052:3391093]

B:BD[3.3391093] → [7.27464:27513]

        weird_colours(random2(256), wc);
        mprf("The dust glows a %s colour!", wc);

[3.3391009]

[3.3391172]

        msg::stream << "The dust glows a " << weird_colours(random2(256))
                    << " colour!" << std::endl;

Replacement in crawl-ref/source/effects.cc at line 398 [3.3382105]

B:BD[3.3391570] → [3.3391570:3391615]

B:BD[3.3391615] → [7.27514:27658]

            weird_colours(random2(256), wc);
            mprf("%s glows %s for a moment.",
                 you.inv[you.equip[EQ_WEAPON]].name(DESC_CAP_YOUR).c_str(),
                 wc);

[3.3391385]

[3.3391712]

            msg::stream << you.inv[you.equip[EQ_WEAPON]].name(DESC_CAP_YOUR)
                        << " glows " << weird_colours(random2(256))
                        << " for a moment." << std::endl;

Deletion in crawl-ref/source/effects.cc at line 482 [3.3382105]
B:BD[3.3394836] → [3.3394836:3394864]
```
    unsigned char acqc = 0;
```
Replacement in crawl-ref/source/effects.cc at line 490 [3.3382105]
B:BD[3.3395028] → [3.3395028:3395108]
```
    for (acqc = 0; acqc < max_has_value; acqc++)
        already_has[acqc] = 0;
```
[3.3395028]
[3.3395108]
```
    already_has.init(0);
```
Replacement in crawl-ref/source/effects.cc at line 529 [3.3382105]
B:BD[3.3396394] → [3.3396394:3396439]
```
    for (acqc = 0; acqc < ENDOFPACK; acqc++)
```
[3.3396394]
[3.3396439]
```
    for (int acqc = 0; acqc < ENDOFPACK; acqc++)
```

Replacement in crawl-ref/source/effects.cc at line 1199 [3.3382105]

B:BD[3.3418265] → [3.3418265:3418448]

                you.had_book[ BOOK_MINOR_MAGIC_I ] = 1;    
                you.had_book[ BOOK_MINOR_MAGIC_II ] = 1;    
                you.had_book[ BOOK_MINOR_MAGIC_III ] = 1;

[3.3418265]

[3.3418448]

                you.had_book[ BOOK_MINOR_MAGIC_I ] = true;
                you.had_book[ BOOK_MINOR_MAGIC_II ] = true;
                you.had_book[ BOOK_MINOR_MAGIC_III ] = true;

Replacement in crawl-ref/source/effects.cc at line 1206 [3.3382105]

B:BD[3.3418624] → [3.3418624:3418747]

                you.had_book[ BOOK_CONJURATIONS_I ] = 1;    
                you.had_book[ BOOK_CONJURATIONS_II ] = 1;

[3.3418624]

[3.3418747]

                you.had_book[ BOOK_CONJURATIONS_I ] = true;
                you.had_book[ BOOK_CONJURATIONS_II ] = true;

Replacement in crawl-ref/source/effects.cc at line 1211 [3.3382105]

B:BD[3.3418792] → [4.942670:942726]

                you.had_book[ thing.sub_type ] = 1;

[3.3418792]

[3.3418862]

                you.had_book[ thing.sub_type ] = true;

More minor cleanups.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-book.cc at line 1031 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1037 [3.397614]

Replacement in crawl-ref/source/spl-book.cc at line 1044 [3.397614]

Replacement in crawl-ref/source/mstuff2.cc at line 1980 [3.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 1982 [3.1340842]

Replacement in crawl-ref/source/monplace.h at line 69 [3.1638277]

Replacement in crawl-ref/source/monplace.cc at line 1473 [3.1641732]

Replacement in crawl-ref/source/misc.h at line 118 [3.1928926]

Replacement in crawl-ref/source/misc.h at line 125 [3.1928926]

Replacement in crawl-ref/source/misc.cc at line 1468 [3.1933596]

Replacement in crawl-ref/source/misc.cc at line 1470 [3.1933596]

Insertion in crawl-ref/source/misc.cc at line 1474 [3.1933596]

Replacement in crawl-ref/source/misc.cc at line 1485 [3.1933596]

Deletion in crawl-ref/source/misc.cc at line 1488 [3.1933596]

Replacement in crawl-ref/source/misc.cc at line 1490 [3.1933596]

Replacement in crawl-ref/source/misc.cc at line 1507 [3.1933596]

Replacement in crawl-ref/source/misc.cc at line 1511 [3.1933596]

Replacement in crawl-ref/source/misc.cc at line 1524 [3.1933596]

Replacement in crawl-ref/source/misc.cc at line 1641 [3.1933596]

Insertion in crawl-ref/source/misc.cc at line 1644 [3.1933596]

Replacement in crawl-ref/source/misc.cc at line 1647 [3.1933596]

Replacement in crawl-ref/source/misc.cc at line 1657 [3.1933596]

Replacement in crawl-ref/source/misc.cc at line 1662 [3.1933596]

Replacement in crawl-ref/source/misc.cc at line 1683 [3.1933596]

Replacement in crawl-ref/source/mapdef.cc at line 959 [4.594797]

Insertion in crawl-ref/source/it_use3.cc at line 801 [3.2870456]

Deletion in crawl-ref/source/it_use3.cc at line 804 [3.2870456]

Deletion in crawl-ref/source/effects.cc at line 381 [3.3382105]

Replacement in crawl-ref/source/effects.cc at line 386 [3.3382105]

Replacement in crawl-ref/source/effects.cc at line 398 [3.3382105]

Deletion in crawl-ref/source/effects.cc at line 482 [3.3382105]

Replacement in crawl-ref/source/effects.cc at line 490 [3.3382105]

Replacement in crawl-ref/source/effects.cc at line 529 [3.3382105]

Replacement in crawl-ref/source/effects.cc at line 1199 [3.3382105]

Replacement in crawl-ref/source/effects.cc at line 1206 [3.3382105]

Replacement in crawl-ref/source/effects.cc at line 1211 [3.3382105]