fiddlerwoaroof/crawl - Change 2VUJ2IMYI7MYLFMSPYAH6IEXIMFG4JUSUYLVCW7SZELHSLPIEL3AC

Fix invisible monsters being described to "burst forth from the water"

if there's no water nearby. (BR 1994574)

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

Created by j-p-e-g on June 18, 2008

2VUJ2IMYI7MYLFMSPYAH6IEXIMFG4JUSUYLVCW7SZELHSLPIEL3AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mon-util.cc at line 5299 [5.1699344]
[3.6353]
[3.6353]
```
        {
```
Insertion in crawl-ref/source/mon-util.cc at line 5302 [5.1699344]
[3.6463]
[3.6463]
```
        }
```

Replacement in crawl-ref/source/mon-util.cc at line 5336 [5.1699344]

B:BD[6.1320] → [6.1320:1398]

        else if (mons_near(this) && monster_habitable_grid(this, DNGN_FLOOR))

[6.1320]

[6.1398]

        else if (mons_near(this)
                 && grid_compatible(grd[this->x][this->y], DNGN_DEEP_WATER))

Replacement in crawl-ref/source/describe.cc at line 2944 [5.3736416]

B:BD[4.3098] → [4.3098:3145]

            const std::string cost = "(Food)";

[4.3098]

[4.3145]

            const std::string cost = "(" + make_cost_description(
                                                ABIL_TROG_BURN_BOOKS) + ")";

Replacement in crawl-ref/source/abl-show.cc at line 1685 [5.4494389]

B:BD[7.7775] → [8.2833:2897]

        if ( !ely_destroy_weapons() )
            return false;

[7.7775]

[7.7967]

        if (!ely_destroy_weapons())
            return (false);

Replacement in crawl-ref/source/abl-show.cc at line 1691 [5.4494389]
B:BD[5.4527677] → [9.5179:5205]
```
            return false;
```
[5.4527677]
[5.4527696]
```
            return (false);
```
Replacement in crawl-ref/source/abl-show.cc at line 1703 [5.4494389]
B:BD[5.4527981] → [9.5206:5232]
```
            return false;
```
[5.4527981]
[5.4528000]
```
            return (false);
```
Replacement in crawl-ref/source/abl-show.cc at line 1717 [5.4494389]
B:BD[5.4528346] → [9.5233:5259]
```
            return false;
```
[5.4528346]
[5.4528365]
```
            return (false);
```

Replacement in crawl-ref/source/abl-show.cc at line 1726 [5.4494389]

B:BD[10.5557] → [10.5557:5610]

            return false;       // don't incur costs

[10.5557]

[10.5610]

            return (false);       // Don't incur costs.

Replacement in crawl-ref/source/abl-show.cc at line 1765 [5.4494389]
B:BD[10.6481] → [10.6481:6507]
```
            return false;
```
[10.6481]
[10.6507]
```
            return (false);
```
Replacement in crawl-ref/source/abl-show.cc at line 1770 [5.4494389]
B:BD[10.6637] → [10.6637:6663]
```
            return false;
```
[10.6637]
[10.6663]
```
            return (false);
```
Replacement in crawl-ref/source/abl-show.cc at line 1782 [5.4494389]
B:BD[11.519] → [12.3921:3943]
```
        // Deflate HP
```
[11.519]
[12.3943]
```
        // Deflate HP.
```
Replacement in crawl-ref/source/abl-show.cc at line 1785 [5.4494389]
B:BD[12.3990] → [12.3990:4023]
```
        // Lose 1d2 permanent MP
```
[12.3990]
[12.4023]
```
        // Lose 1d2 permanent MP.
```
Replacement in crawl-ref/source/abl-show.cc at line 1788 [5.4494389]
∅:D[2.2817] → [12.4059:4081]
B:BD[12.4059] → [12.4059:4081]
```
        // Deflate MP
```
[2.2817]
[12.4081]
```
        // Deflate MP.
```
Replacement in crawl-ref/source/abl-show.cc at line 1793 [5.4494389]
∅:D[12.4166] → [11.519:589]
∅:D[13.6902] → [11.519:589]
B:BD[11.519] → [11.519:589]
```
        activate_notes(false);  // this banishment shouldn't be noted
```
[13.6902]
[10.6673]
```
        activate_notes(false);  // This banishment shouldn't be noted.
```

Replacement in crawl-ref/source/abl-show.cc at line 1799 [5.4494389]

∅:D[14.6534] → [15.2597:2662]

B:BD[15.2597] → [15.2597:2662]

        if ( !choose_deck_and_draw() )
            return false;

[14.6534]

[15.2662]

        if (!choose_deck_and_draw())
            return (false);

Replacement in crawl-ref/source/abl-show.cc at line 1805 [5.4494389]
B:BD[14.6567] → [14.6567:6595]
∅:D[14.6595] → [16.5421:5447]
B:BD[17.6242] → [16.5421:5447]
```
        if ( !deck_peek() )
            return false;
```
[14.6567]
[14.6596]
```
        if (!deck_peek())
            return (false);
```
Replacement in crawl-ref/source/abl-show.cc at line 1811 [5.4494389]
B:BD[14.6681] → [14.6681:6716]
∅:D[14.6716] → [18.4822:4848]
B:BD[16.5519] → [18.4822:4848]
```
        if ( !deck_triple_draw() )
            return false;
```
[14.6681]
[14.6717]
```
        if (!deck_triple_draw())
            return (false);
```
Replacement in crawl-ref/source/abl-show.cc at line 1817 [5.4494389]
∅:D[14.6800] → [19.64448:64502]
B:BD[19.64448] → [19.64448:64502]
```
        if ( !deck_mark() )
            return false;
```
[14.6800]
[19.64502]
```
        if (!deck_mark())
            return (false);
```
Replacement in crawl-ref/source/abl-show.cc at line 1823 [5.4494389]
∅:D[14.6835] → [18.4898:4927]
B:BD[18.4898] → [18.4898:4927]
∅:D[18.4927] → [17.6242:6268]
∅:D[16.5519] → [17.6242:6268]
B:BD[17.6242] → [17.6242:6268]
```
        if ( !deck_stack() )
            return false;
```
[14.6835]
[20.945]
```
        if (!deck_stack())
            return (false);
```
Insertion in crawl-ref/source/abl-show.cc at line 1831 [5.4494389]
[21.23344]
[21.23344]
```
        {
```
Insertion in crawl-ref/source/abl-show.cc at line 1833 [5.4494389]
[21.23372]
[21.23372]
```
        }
```

Fix invisible monsters being described to "burst forth from the water"

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/mon-util.cc at line 5299 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5302 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5336 [5.1699344]

Replacement in crawl-ref/source/describe.cc at line 2944 [5.3736416]

Replacement in crawl-ref/source/abl-show.cc at line 1685 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1691 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1703 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1717 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1726 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1765 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1770 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1782 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1785 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1788 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1793 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1799 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1805 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1811 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1817 [5.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 1823 [5.4494389]

Insertion in crawl-ref/source/abl-show.cc at line 1831 [5.4494389]

Insertion in crawl-ref/source/abl-show.cc at line 1833 [5.4494389]