fiddlerwoaroof/crawl - Change UIVESOFZ4C262RYTFHSTFZIYTPTWSRJCFJAOZX7O2PQ35DFRDDEAC

Disallow the Staff of Wucad Mu as a Trog gift.

And another of those code cleanups.

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

Created by j-p-e-g on April 16, 2008

UIVESOFZ4C262RYTFHSTFZIYTPTWSRJCFJAOZX7O2PQ35DFRDDEAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 958 [5.39949]
B:BD[2.2280] → [2.2280:2297]
```
            do {
```
[2.2280]
[2.2297]
```
            do
            {
```

Replacement in crawl-ref/source/travel.cc at line 962 [5.39949]

B:BD[2.2369] → [2.2369:2541]

            } while (is_travelsafe_square(target.x, target.y)
                     && is_traversable(feature)
                     && feature_traverse_cost(feature) == 1);

[2.2369]

[2.2541]

            }
            while (is_travelsafe_square(target.x, target.y)
                   && is_traversable(feature)
                   && feature_traverse_cost(feature) == 1);

Replacement in crawl-ref/source/travel.cc at line 2004 [5.39949]
∅:D[6.1918] → [5.86329:86369]
B:BD[5.86329] → [5.86329:86369]
```
                &id.branch, &id.depth);
```
[6.1918]
[5.86369]
```
                           &id.branch, &id.depth);
```
Replacement in crawl-ref/source/travel.cc at line 2010 [5.39949]
B:BD[5.86483] → [5.86483:86507]
```
    } while (id.depth);
```
[5.86483]
[5.86507]
```
    }
    while (id.depth);
```
Replacement in crawl-ref/source/stuff.cc at line 151 [8.224557]
B:BD[7.3278] → [7.3278:3287]
```
    do {
```
[7.3278]
[7.3287]
```
    do
    {
```

Replacement in crawl-ref/source/stuff.cc at line 154 [8.224557]

B:BD[7.3309] → [7.3309:3368]

    } while ( !this->done() && !this->on_valid_square() );

[7.3309]

[7.3368]

    }
    while ( !this->done() && !this->on_valid_square() );

Replacement in crawl-ref/source/stuff.cc at line 162 [8.224557]
B:BD[7.3444] → [7.3444:3453]
```
    do {
```
[7.3444]
[7.3453]
```
    do
    {
```

Replacement in crawl-ref/source/stuff.cc at line 165 [8.224557]

B:BD[7.3480] → [7.3480:3539]

    } while ( !this->done() && !this->on_valid_square() );

[7.3480]

[7.3539]

    }
    while ( !this->done() && !this->on_valid_square() );

Replacement in crawl-ref/source/randart.cc at line 203 [8.893152]
B:BD[9.7833] → [9.7833:7849]
```
           do {
```
[9.7833]
[9.7849]
```
           do
           {
```

Replacement in crawl-ref/source/randart.cc at line 206 [8.893152]

B:BD[9.7919] → [9.7919:7977]

           } while (!god_fits_artefact(which_god, item));

[9.7919]

[9.7977]

           }
           while (!god_fits_artefact(which_god, item));

Replacement in crawl-ref/source/randart.cc at line 1677 [8.893152]

B:BD[4.2876] → [4.2876:2918]

        } while (randart_is_bad( item ));

[4.2876]

[4.2918]

        }
        while (randart_is_bad( item ));

Replacement in crawl-ref/source/newgame.cc at line 3837 [8.1132300]
B:BD[8.1223763] → [10.9849:9870]
```
                do {
```
[8.1223763]
[10.9870]
```
                do
                {
```
Replacement in crawl-ref/source/newgame.cc at line 4440 [8.1132300]
B:BD[8.1252387] → [10.12280:12297]
```
            do {
```
[8.1252387]
[10.12297]
```
            do
            {
```
Replacement in crawl-ref/source/menu.cc at line 1097 [5.261322]
B:BD[11.2222] → [11.2222:2239]
```
            do {
```
[11.2222]
[11.2239]
```
        {
            do
            {
```

Replacement in crawl-ref/source/menu.cc at line 1101 [5.261322]

B:BD[11.2277] → [11.2277:2311]

            } while ( nsel < 0 );

[11.2277]

[11.2311]

            }
            while ( nsel < 0 );
        }

Replacement in crawl-ref/source/menu.cc at line 1110 [5.261322]
B:BD[11.2440] → [11.2440:2457]
```
            do {
```
[11.2440]
[11.2457]
```
        {
            do
            {
```

Replacement in crawl-ref/source/menu.cc at line 1114 [5.261322]

B:BD[11.2495] → [11.2495:2559]

            } while ( nsel >= static_cast<int>(items.size()) );

[11.2495]

[11.2559]

            }
            while ( nsel >= static_cast<int>(items.size()) );
        }

Replacement in crawl-ref/source/initfile.cc at line 1596 [8.2957258]
∅:D[12.4888] → [5.404321:404347]
B:BD[5.404321] → [5.404321:404347]
```
    std::string key = "";
```
[12.4888]
[5.404347]
```
    std::string key    = "";
```
Replacement in crawl-ref/source/initfile.cc at line 1598 [8.2957258]
B:BD[5.404376] → [5.404376:404404]
```
    std::string field = "";
```
[5.404376]
[5.404404]
```
    std::string field  = "";
```
Replacement in crawl-ref/source/initfile.cc at line 1600 [8.2957258]
B:BD[13.798454] → [13.798454:798483]
```
    bool plus_equal = false;
```
[5.404405]
[14.9843]
```
    bool plus_equal  = false;
```
Deletion in crawl-ref/source/ghost.cc at line 126 [15.9890]
B:BD[3.4177] → [3.4177:4258]
```
    // HACKY: demons and ghosts always resist poison
//    resists.poison   = 1;
```
Replacement in crawl-ref/source/ghost.cc at line 175 [15.9890]
B:BD[15.13467] → [15.13467:13480]
```
        do {
```
[15.13467]
[16.20302]
```
        do
        {
```

Replacement in crawl-ref/source/ghost.cc at line 179 [15.9890]

B:BD[17.349] → [3.4351:4394]

∅:D[3.4394] → [16.20424:20472]

B:BD[16.20424] → [16.20424:20472]

∅:D[16.20472] → [18.348:404]

B:BD[18.348] → [18.348:404]

B:BD[18.404] → [16.20473:20524]

∅:D[16.20524] → [19.3823:3885]

B:BD[19.3823] → [19.3823:3885]

B:BD[19.3885] → [3.4395:4482]

∅:D[3.4482] → [16.20614:20657]

B:BD[16.20614] → [16.20614:20657]

        } while (brand == SPWPN_HOLY_WRATH
                 || (brand == SPWPN_ORC_SLAYING
                     && you.mons_species() != MONS_ORC)
                 || (brand == SPWPN_DRAGON_SLAYING
                     && you.mons_species() != MONS_DRACONIAN)
                 || brand == SPWPN_PROTECTION
                 || brand == SPWPN_FLAME
                 || brand == SPWPN_FROST);

[17.349]

[15.13948]

        }
        while (brand == SPWPN_HOLY_WRATH
               || (brand == SPWPN_ORC_SLAYING
                   && you.mons_species() != MONS_ORC)
               || (brand == SPWPN_DRAGON_SLAYING
                   && you.mons_species() != MONS_DRACONIAN)
               || brand == SPWPN_PROTECTION
               || brand == SPWPN_FLAME
               || brand == SPWPN_FROST);

Replacement in crawl-ref/source/effects.cc at line 1505 [8.3382105]

B:BD[20.3161] → [20.3161:3226]

                       && doodad.special == SPWPN_WRATH_OF_TROG)

[20.3161]

[20.3226]

                       && (doodad.special == SPWPN_WRATH_OF_TROG
                           || doodad.special == SPWPN_STAFF_OF_WUCAD_MU))

Replacement in crawl-ref/source/decks.cc at line 760 [8.3987460]
B:BD[21.4005] → [21.4005:4014]
```
    do {
```
[21.4005]
[21.4014]
```
    do
    {
```

Disallow the Staff of Wucad Mu as a Trog gift.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/travel.cc at line 958 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 962 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 2004 [5.39949]

Replacement in crawl-ref/source/travel.cc at line 2010 [5.39949]

Replacement in crawl-ref/source/stuff.cc at line 151 [8.224557]

Replacement in crawl-ref/source/stuff.cc at line 154 [8.224557]

Replacement in crawl-ref/source/stuff.cc at line 162 [8.224557]

Replacement in crawl-ref/source/stuff.cc at line 165 [8.224557]

Replacement in crawl-ref/source/randart.cc at line 203 [8.893152]

Replacement in crawl-ref/source/randart.cc at line 206 [8.893152]

Replacement in crawl-ref/source/randart.cc at line 1677 [8.893152]

Replacement in crawl-ref/source/newgame.cc at line 3837 [8.1132300]

Replacement in crawl-ref/source/newgame.cc at line 4440 [8.1132300]

Replacement in crawl-ref/source/menu.cc at line 1097 [5.261322]

Replacement in crawl-ref/source/menu.cc at line 1101 [5.261322]

Replacement in crawl-ref/source/menu.cc at line 1110 [5.261322]

Replacement in crawl-ref/source/menu.cc at line 1114 [5.261322]

Replacement in crawl-ref/source/initfile.cc at line 1596 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1598 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1600 [8.2957258]

Deletion in crawl-ref/source/ghost.cc at line 126 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 175 [15.9890]

Replacement in crawl-ref/source/ghost.cc at line 179 [15.9890]

Replacement in crawl-ref/source/effects.cc at line 1505 [8.3382105]

Replacement in crawl-ref/source/decks.cc at line 760 [8.3987460]