fiddlerwoaroof/crawl - Change NPHMGUOC2SFA2UL2BX7WRSSD4XQE5Y7WE56QZGBDZNKA7ABY4HBQC

Combine mons_is_submerged(monsters *m) into monsters::submerged()

…and replace all references to mons_is_submerged() with submerged().

It's a dirty job, but someone's got to do it. (Thank God for regex!)

Created by abrahamwl on October 31, 2009

NPHMGUOC2SFA2UL2BX7WRSSD4XQE5Y7WE56QZGBDZNKA7ABY4HBQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 870 [8.3]

B:BD[6.57] → [7.4:45]

            && !mons_is_submerged(mon));

[6.57]

[9.1377]

            && !mon->submerged());

Replacement in crawl-ref/source/view.cc at line 1280 [12.16817]
∅:D[10.344] → [11.93:133]
B:BD[11.93] → [11.93:133]
```
        if (mons_is_submerged(monster))
```
[10.344]
[13.664]
```
        if (monster->submerged())
```
Replacement in crawl-ref/source/tilepick.cc at line 2412 [15.96318]
B:BD[14.619] → [14.619:659]
```
            if (mons_is_submerged(mon))
```
[14.619]
[16.666]
```
            if (mon->submerged())
```
Replacement in crawl-ref/source/terrain.cc at line 708 [18.26938]
B:BD[17.2445] → [17.2445:2489]
```
        if (mon && !mons_is_submerged(mon))
```
[17.2445]
[17.2489]
```
        if (mon && !mon->submerged())
```

Replacement in crawl-ref/source/player.cc at line 122 [12.962854]

B:BD[19.2972] → [20.12247:12315]

                            || mons_is_submerged( &menv[ mgrd(p) ])

[19.2972]

[20.12315]

                            || menv[ mgrd(p) ].submerged()

Replacement in crawl-ref/source/player.cc at line 1056 [12.962854]
B:BD[12.971309] → [21.3295:3328]
```
    if (!mons_is_submerged(mon))
```
[12.971309]
[21.3328]
```
    if (!mon->submerged())
```
Replacement in crawl-ref/source/player.cc at line 2732 [12.962854]
B:BD[22.2680] → [22.2680:2719]
```
            || mons_is_submerged(mon))
```
[22.2680]
[23.1077]
```
            || mon->submerged())
```

Replacement in crawl-ref/source/monstuff.cc at line 2863 [12.1396662]

B:BD[24.3769] → [2.3142:3220]

    if (!mons_is_submerged(targ) || monster->has_damage_type(DVORP_TENTACLE))

[24.3769]

[24.3803]

    if (!targ->submerged() || monster->has_damage_type(DVORP_TENTACLE))

Replacement in crawl-ref/source/monstuff.cc at line 5656 [12.1396662]
∅:D[5.3564] → [19.3383:3422]
B:BD[25.2869] → [19.3383:3422]
```
        || mons_is_submerged(monster))
```
[5.3564]
[12.1467656]
```
        || monster->submerged())
```

Replacement in crawl-ref/source/monstuff.cc at line 5811 [12.1396662]

B:BD[26.8171] → [26.8171:8221]

                else if (!mons_is_submerged(mon))

[26.8171]

[26.8221]

                else if (!mon->submerged())

Replacement in crawl-ref/source/monstuff.cc at line 5868 [12.1396662]
∅:D[5.3634] → [27.6179:6219]
B:BD[27.6179] → [27.6179:6219]
```
         || mons_is_submerged(monster))
```
[5.3634]
[4.7171]
```
         || monster->submerged())
```
Replacement in crawl-ref/source/monstuff.cc at line 6445 [12.1396662]
B:BD[12.1481457] → [19.3463:3499]
```
    if (mons_is_submerged(monster))
```
[12.1481457]
[12.1481517]
```
    if (monster->submerged())
```
Replacement in crawl-ref/source/monstuff.cc at line 6507 [12.1396662]
B:BD[19.3537] → [19.3537:3575]
```
        || mons_is_submerged(monster)
```
[19.3537]
[25.6582]
```
        || monster->submerged()
```
Replacement in crawl-ref/source/monstuff.cc at line 6848 [12.1396662]
∅:D[5.3745] → [19.3576:3614]
B:BD[25.12672] → [19.3576:3614]
```
        || mons_is_submerged(monster)
```
[5.3745]
[28.7103]
```
        || monster->submerged()
```
Replacement in crawl-ref/source/monstuff.cc at line 7560 [12.1396662]
B:BD[29.50538] → [19.4023:4063]
```
        && !mons_is_submerged(monster))
```
[29.50538]
[30.429445]
```
        && !monster->submerged())
```

Replacement in crawl-ref/source/monstuff.cc at line 7680 [12.1396662]

B:BD[31.4583] → [32.4681:4729]

                if (mons_is_submerged(monster))

[31.4583]

[32.4729]

                if (monster->submerged())

Replacement in crawl-ref/source/monstuff.cc at line 7771 [12.1396662]

B:BD[33.3737] → [19.4109:4157]

                if (mons_is_submerged(monster))

[33.3737]

[33.3792]

                if (monster->submerged())

Replacement in crawl-ref/source/monstuff.cc at line 7812 [12.1396662]

B:BD[34.7636] → [19.4158:4208]

                   && mons_is_submerged(monster))

[34.7636]

[34.7693]

                   && monster->submerged())

Replacement in crawl-ref/source/monstuff.cc at line 8342 [12.1396662]
B:BD[35.8903] → [5.3809:3866]
```
    if (monster->asleep() || mons_is_submerged(monster))
```
[35.8903]
[35.8968]
```
    if (monster->asleep() || monster->submerged())
```
Replacement in crawl-ref/source/monstuff.cc at line 9063 [12.1396662]
B:BD[33.4611] → [36.2637:2677]
```
        if (mons_is_submerged(monster))
```
[33.4611]
[37.4856]
```
        if (monster->submerged())
```
Deletion in crawl-ref/source/mon-util.h at line 841 [12.1682293]
B:BD[38.5061] → [39.2973:3016]
```
bool mons_is_submerged(const monsters *m);
```

Replacement in crawl-ref/source/mon-util.cc at line 2061 [12.1699344]

B:BD[40.2886] → [41.4207:4272]

                                     && mons_is_submerged(&mon);

[40.2886]

[42.11255]

                                     && mon.submerged();

Deletion in crawl-ref/source/mon-util.cc at line 2700 [12.1699344]
∅:D[43.3172] → [44.8180:8183]
B:BD[44.8180] → [44.8180:8183]
B:BD[44.8183] → [39.3018:3060]
∅:D[45.226] → [46.247605:247607]
∅:D[47.2953] → [46.247605:247607]
∅:D[39.3060] → [46.247605:247607]
∅:D[30.481918] → [46.247605:247607]
B:BD[46.247605] → [46.247605:247607]
B:BD[46.247607] → [30.481919:481992]
B:BD[30.481992] → [19.5443:5657]
```
}
bool mons_is_submerged(const monsters *m)
{
    // FIXME, switch to 4.1's MF_SUBMERGED system which is much cleaner.
    if (m->has_ench(ENCH_SUBMERGED))
        return (true);
    if (grd(m->pos()) == DNGN_DEEP_WATER
        && !monster_habitable_grid(m, DNGN_DEEP_WATER))
    {
        return (true);
    }
    return (false);
```

Replacement in crawl-ref/source/mon-util.cc at line 3720 [12.1699344]

B:BD[48.865] → [48.865:903]

    return (mons_is_submerged(this));

[48.865]

[49.2651]

    // FIXME, switch to 4.1's MF_SUBMERGED system which is much cleaner.
    // Can't find any reference to MF_SUBMERGED anywhere. Don't know what
    // this means. - abrahamwl
    if (has_ench(ENCH_SUBMERGED))
        return (true);
    if (grd(pos()) == DNGN_DEEP_WATER
        && !monster_habitable_grid(this, DNGN_DEEP_WATER))
    {
        return (true);
    }
    return (false);

Replacement in crawl-ref/source/mon-util.cc at line 5854 [12.1699344]
B:BD[50.15238] → [51.6724:6775]
```
            else if (player_can_hear(this->pos()))
```
[50.15238]
[52.2794]
```
            else if (player_can_hear(pos()))
```
Replacement in crawl-ref/source/mon-util.cc at line 5861 [12.1699344]
B:BD[53.12493] → [53.12493:12526]
```
    if (mons_is_submerged(this))
```
[53.12493]
[53.12526]
```
    if (submerged())
```
Replacement in crawl-ref/source/misc.cc at line 2802 [12.1933596]
∅:D[3.4442] → [54.3348:3391]
B:BD[54.3348] → [54.3348:3391]
```
                && !mons_is_submerged(mon)
```
[3.4442]
[55.5449]
```
                && !mon->submerged()
```

Replacement in crawl-ref/source/delay.cc at line 1936 [12.3963459]

B:BD[56.523] → [3.4923:4993]

        if (mon && !mon->visible_to(&you) && !mons_is_submerged(mon))

[56.523]

[57.15876]

        if (mon && !mon->visible_to(&you) && !mon->submerged())

Replacement in crawl-ref/source/acr.cc at line 3895 [12.4397395]
B:BD[12.4474755] → [58.16071:16125]
```
    if (targ_monst && !mons_is_submerged(targ_monst))
```
[12.4474755]
[12.4475072]
```
    if (targ_monst && !targ_monst->submerged())
```

Combine mons_is_submerged(monsters *m) into monsters::submerged()

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 870 [8.3]

Replacement in crawl-ref/source/view.cc at line 1280 [12.16817]

Replacement in crawl-ref/source/tilepick.cc at line 2412 [15.96318]

Replacement in crawl-ref/source/terrain.cc at line 708 [18.26938]

Replacement in crawl-ref/source/player.cc at line 122 [12.962854]

Replacement in crawl-ref/source/player.cc at line 1056 [12.962854]

Replacement in crawl-ref/source/player.cc at line 2732 [12.962854]

Replacement in crawl-ref/source/monstuff.cc at line 2863 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5656 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5811 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5868 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6445 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6507 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6848 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7560 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7680 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7771 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7812 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 8342 [12.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 9063 [12.1396662]

Deletion in crawl-ref/source/mon-util.h at line 841 [12.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 2061 [12.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 2700 [12.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3720 [12.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5854 [12.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5861 [12.1699344]

Replacement in crawl-ref/source/misc.cc at line 2802 [12.1933596]

Replacement in crawl-ref/source/delay.cc at line 1936 [12.3963459]

Replacement in crawl-ref/source/acr.cc at line 3895 [12.4397395]