fiddlerwoaroof/crawl - Change M6JQ7Z4RM3KUHVM74UNVUUUO4WV2CEW663CSHCKANVQ4PUVRIMFAC

Fix an ancient bug where monsters couldn't swap positions vertically

(only horizontally or diagonally.) Quash a couple of potential bugs too. Code cleanups.

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

Created by haranp on February 1, 2009

M6JQ7Z4RM3KUHVM74UNVUUUO4WV2CEW663CSHCKANVQ4PUVRIMFAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1742 [7.1396662]
B:BD[7.1420025] → [8.43007:43035]
```
    monsters *child = NULL;
```
[7.1420025]
[7.1420225]
```
    if (!mons_class_flag(parent->type, M_SPLITS))
        return (false);
```

Replacement in crawl-ref/source/monstuff.cc at line 1745 [7.1396662]

B:BD[7.1420226] → [9.2780:2857]

    if (!mons_class_flag(parent->type, M_SPLITS) || parent->hit_points == 1)

[7.1420226]

[7.1420299]

    const int reqd = std::max(parent->hit_dice * 8, 50);
    if (parent->hit_points < reqd)

Insertion in crawl-ref/source/monstuff.cc at line 1749 [7.1396662]
[8.43037]
[8.43037]
```
    monsters *child = NULL;
```

Replacement in crawl-ref/source/monstuff.cc at line 1801 [7.1396662]

B:BD[7.1422349] → [7.1422349:1422355]

B:BD[7.1422355] → [10.6543:6608]

    {
        if (!silenced(parent->pos()) || !silenced(child->pos()))

[7.1422349]

[11.418417]

        if (player_can_hear(parent->pos()) || player_can_hear(child->pos()))

Deletion in crawl-ref/source/monstuff.cc at line 1803 [7.1396662]
∅:D[11.418479] → [7.1422482:1422488]
B:BD[7.1422482] → [7.1422482:1422488]
```
    }
```
Replacement in crawl-ref/source/monstuff.cc at line 1808 [7.1396662]
B:BD[7.1422508] → [2.2568:2622]
```
}                               // end jelly_divide()
```
[7.1422508]
[7.1422561]
```
}
```
Replacement in crawl-ref/source/monstuff.cc at line 6771 [7.1396662]
B:BD[12.1005] → [13.2568:2605]
B:BD[13.2605] → [3.2469:2511]
∅:D[3.2511] → [14.3472:3478]
B:BD[13.2660] → [14.3472:3478]
```
    if (monster->has_ench(ENCH_SICK)
        || !mons_can_regenerate(monster))
    {
```
[12.1005]
[15.671]
```
    if (monster->has_ench(ENCH_SICK) || !mons_can_regenerate(monster))
```
Deletion in crawl-ref/source/monstuff.cc at line 6773 [7.1396662]
B:BD[15.687] → [14.3479:3485]
```
    }
```

Replacement in crawl-ref/source/monstuff.cc at line 7060 [7.1396662]

B:BD[16.7551] → [6.12819:12897]

        if (avoid_cloud && monster_can_submerge(monster, grd(monster->pos()))

[16.7551]

[17.5215]

        if (avoid_cloud
            && monster_can_submerge(monster, grd(monster->pos()))

Deletion in crawl-ref/source/monstuff.cc at line 7203 [7.1396662]
B:BD[4.2628] → [4.2628:2781]
∅:D[4.2781] → [7.1512199:1512200]
∅:D[18.7892] → [7.1512199:1512200]
∅:D[11.434366] → [7.1512199:1512200]
B:BD[7.1512199] → [7.1512199:1512200]
```
        bolt beem;
        beem.source      = monster->pos();
        beem.target      = monster->target;
        beem.beam_source = monster->mindex();
```

Insertion in crawl-ref/source/monstuff.cc at line 7210 [7.1396662]

[11.434557]

[5.5211]

            bolt beem;
            
            beem.source      = monster->pos();
            beem.target      = monster->target;
            beem.beam_source = monster->mindex();

Replacement in crawl-ref/source/monstuff.cc at line 7397 [7.1396662]

B:BD[19.248] → [20.10065:10129]

∅:D[20.10129] → [19.311:372]

B:BD[19.311] → [19.311:372]

    // Don't eat artefacts (note that unrandarts are randarts).
    if (is_fixed_artefact(item) || is_random_artefact(item))

[19.248]

[19.372]

    // Don't eat artefacts.
    if (is_artefact(item))

Replacement in crawl-ref/source/monstuff.cc at line 7430 [7.1396662]

B:BD[7.1519659] → [7.1519659:1519703]

B:BD[7.1519739] → [7.1519739:1519810]

    // single calculation permissible {dlb}
    bool monsterNearby = mons_near(monster);
    int  item = NON_ITEM;

[7.1519659]

[21.245193]

    if (mons_is_sleeping(monster) || mons_is_submerged(monster))
        return (false);

Replacement in crawl-ref/source/monstuff.cc at line 7433 [7.1396662]
B:BD[21.245194] → [22.12867:12901]
B:BD[22.12901] → [23.4209:4248]
∅:D[23.4248] → [22.12947:12953]
B:BD[22.12947] → [22.12947:12953]
∅:D[22.12953] → [7.1519861:1519885]
∅:D[21.245235] → [7.1519861:1519885]
B:BD[7.1519861] → [7.1519861:1519885]
B:BD[7.1519885] → [22.12954:12960]
```
    if (mons_is_sleeping(monster)
        || mons_is_submerged(monster))
    {
        return (false);
    }
```
[21.245194]
[7.1519885]
```
    const bool monster_nearby = mons_near(monster);
```
Deletion in crawl-ref/source/monstuff.cc at line 7441 [7.1396662]
∅:D[24.23293] → [25.2930:2980]
B:BD[7.1520061] → [25.2930:2980]
```
        int  midx       = monster_index(monster);
```

Replacement in crawl-ref/source/monstuff.cc at line 7446 [7.1396662]

B:BD[7.1520155] → [8.51563:51605]

∅:D[26.9744] → [7.1520206:1520312]

∅:D[8.51605] → [7.1520206:1520312]

B:BD[7.1520206] → [7.1520206:1520312]

        for (item = igrd(monster->pos());
             item != NON_ITEM && eaten < max_eat && hps_gained < 50;
             item = mitm[item].link)

[7.1520155]

[7.1520312]

        for (stack_iterator si(monster->pos());
             si && eaten < max_eat && hps_gained < 50;
             ++si)

Replacement in crawl-ref/source/monstuff.cc at line 7450 [7.1396662]
B:BD[7.1520322] → [7.1520322:1520367]
B:BD[7.1520800] → [7.1520800:1520801]
B:BD[7.1520801] → [18.8630:8682]
```
            int quant = mitm[item].quantity;
            if (!_is_item_jelly_edible(mitm[item]))
```
[7.1520322]
[7.1521033]
```
            if (!_is_item_jelly_edible(*si))
```

Replacement in crawl-ref/source/monstuff.cc at line 7456 [7.1396662]

B:BD[27.2718] → [27.2718:2773]

                 mitm[item].name(DESC_PLAIN).c_str());

[27.2718]

[27.2773]

                 si->name(DESC_PLAIN).c_str());

Replacement in crawl-ref/source/monstuff.cc at line 7459 [7.1396662]

B:BD[26.9746] → [8.51606:51672]

            if (mitm[igrd(monster->pos())].base_type != OBJ_GOLD)

[26.9746]

[7.1521148]

            int quant = si->quantity;
            if (si->base_type != OBJ_GOLD)

Replacement in crawl-ref/source/monstuff.cc at line 7463 [7.1396662]

B:BD[7.1521162] → [7.1521162:1521252]

                if (quant > max_eat - eaten)
                    quant = max_eat - eaten;

[7.1521162]

[7.1521252]

                quant = std::min(quant, max_eat - eaten);

Replacement in crawl-ref/source/monstuff.cc at line 7465 [7.1396662]

B:BD[7.1521253] → [11.439484:439562]

                hps_gained += (quant * item_mass( mitm[item] )) / 20 + quant;

[7.1521253]

[7.1521331]

                hps_gained += (quant * item_mass(*si)) / 20 + quant;

Replacement in crawl-ref/source/monstuff.cc at line 7469 [7.1396662]

B:BD[28.248] → [28.248:308]

∅:D[28.308] → [29.2551:2668]

B:BD[30.9113] → [29.2551:2668]

                    && mitm[item].base_type == OBJ_MISSILES
                    && mitm[item].sub_type == MI_THROWING_NET
                    && item_is_stationary(mitm[item]))

[28.248]

[30.9176]

                    && si->base_type == OBJ_MISSILES
                    && si->sub_type == MI_THROWING_NET
                    && item_is_stationary(*si))

Replacement in crawl-ref/source/monstuff.cc at line 7487 [7.1396662]

B:BD[7.1521673] → [25.3118:3218]

            if (quant >= mitm[item].quantity)
                item_was_destroyed(mitm[item], midx);

[7.1521673]

[25.3218]

            if (quant >= si->quantity)
                item_was_destroyed(*si, monster->mindex());

Replacement in crawl-ref/source/monstuff.cc at line 7490 [7.1396662]
∅:D[25.3219] → [7.1521673:1521724]
B:BD[7.1521673] → [7.1521673:1521724]
```
            dec_mitm_item_quantity( item, quant );
```
[25.3219]
[7.1521724]
```
            dec_mitm_item_quantity(si.link(), quant);
```

Replacement in crawl-ref/source/monstuff.cc at line 7495 [7.1396662]

B:BD[7.1521764] → [7.1521764:1521899]

            if (hps_gained < 1)
                hps_gained = 1;
            else if (hps_gained > 50)
                hps_gained = 50;

[7.1521764]

[7.1521899]

            hps_gained = std::max(hps_gained, 1);
            hps_gained = std::min(hps_gained, 50);

Replacement in crawl-ref/source/monstuff.cc at line 7505 [7.1396662]

B:BD[7.1522219] → [31.29394:29477]

            if (!silenced(you.pos())
                && !silenced(monster->pos()))

[7.1522219]

[7.1522321]

            if (player_can_hear(monster->pos()))

Replacement in crawl-ref/source/monstuff.cc at line 7508 [7.1396662]

B:BD[32.18224] → [32.18224:18279]

                     monsterNearby ? "" : " distant");

[32.18224]

[7.1522538]

                     monster_nearby ? "" : " distant");

Insertion in crawl-ref/source/monstuff.cc at line 7510 [7.1396662]
[7.1522552]
[30.9309]

Replacement in crawl-ref/source/monstuff.cc at line 7514 [7.1396662]

B:BD[7.1522553] → [33.2558:2618]

∅:D[33.2618] → [7.1522608:1522622]

∅:D[11.439665] → [7.1522608:1522622]

B:BD[7.1522608] → [7.1522608:1522622]

B:BD[7.1522622] → [33.2619:2677]

∅:D[33.2677] → [7.1522681:1522805]

B:BD[7.1522681] → [7.1522681:1522805]

B:BD[7.1522805] → [18.8683:8727]

∅:D[18.8727] → [7.1522848:1522862]

B:BD[7.1522848] → [7.1522848:1522862]

            if (mons_class_flag( monster->type, M_SPLITS ))
            {
                const int reqd = (monster->hit_dice <= 6)
                                            ? 50 : monster->hit_dice * 8;
                if (monster->hit_points >= reqd)
                    _jelly_divide(monster);
            }

[7.1522553]

[7.1522862]

            _jelly_divide(monster);

Replacement in crawl-ref/source/monstuff.cc at line 7518 [7.1396662]
B:BD[7.1522897] → [7.1522897:1522949]
```
    }                           // end "if jellies"
```
[7.1522897]
[7.1522949]
```
    }
```
Replacement in crawl-ref/source/monstuff.cc at line 7526 [7.1396662]
B:BD[34.2886] → [8.51673:51731]
```
    for (item = igrd(monster->pos()); item != NON_ITEM; )
```
[34.2886]
[7.1523076]
```
    for (stack_iterator si(monster->pos()); si; ++si)
```

Replacement in crawl-ref/source/monstuff.cc at line 7528 [7.1396662]

B:BD[7.1523082] → [35.4106:4236]

        item_def &topickup = mitm[item];
        item = topickup.link;
        if (monster->pickup_item(topickup, monsterNearby))

[7.1523082]

[34.2887]

        if (monster->pickup_item(*si, monster_nearby))

Replacement in crawl-ref/source/monstuff.cc at line 7534 [7.1396662]
∅:D[34.2938] → [7.1529583:1529638]
∅:D[35.4257] → [7.1529583:1529638]
B:BD[7.1529583] → [7.1529583:1529638]
```
}                               // end handle_pickup()
```
[34.2938]
[11.439786]
```
}
```
Replacement in crawl-ref/source/monstuff.cc at line 7538 [7.1396662]
B:BD[11.439832] → [31.29478:29545]
```
    if (!silenced(you.pos())
        && !silenced(monster->pos()))
```
[11.439832]
[11.439918]
```
    if (player_can_hear(monster->pos()))
```

Deletion in crawl-ref/source/monstuff.cc at line 7549 [7.1396662]

B:BD[11.440309] → [11.440309:440426]

B:BD[11.440426] → [26.9751:9805]

∅:D[26.9805] → [11.440481:440555]

B:BD[11.440481] → [11.440481:440555]


    if (mons_class_flag( monster->type, M_SPLITS ))
    {
        // and here is where the jelly might divide {dlb}
        const int reqd = (monster->hit_dice < 6) ? 50
                                                 : monster->hit_dice * 8;

Replacement in crawl-ref/source/monstuff.cc at line 7550 [7.1396662]
B:BD[11.440556] → [11.440556:440597]
B:BD[11.440597] → [18.8773:8809]
∅:D[18.8809] → [11.440632:440638]
B:BD[11.440632] → [11.440632:440638]
```
        if (monster->hit_points >= reqd)
            _jelly_divide(monster);
    }
```
[11.440556]
[11.440638]
```
    _jelly_divide(monster);
```
Replacement in crawl-ref/source/monstuff.cc at line 7592 [7.1396662]
B:BD[11.441791] → [31.29622:29655]
```
    if (delta.x == 0 && delta.y)
```
[11.441791]
[11.441811]
```
    if (delta.origin())
```
Replacement in crawl-ref/source/monstuff.cc at line 7595 [7.1396662]
B:BD[11.441836] → [31.29656:29700]
∅:D[36.2679] → [11.441890:441940]
∅:D[31.29700] → [11.441890:441940]
B:BD[11.441890] → [11.441890:441940]
```
    int targmon = mgrd(mon->pos() + delta);
    if (targmon == MHITNOT || targmon == MHITYOU)
```
[11.441836]
[11.441940]
```
    monsters* const m2 = monster_at(mon->pos() + delta);
    if (!m2)
```
Deletion in crawl-ref/source/monstuff.cc at line 7600 [7.1396662]
B:BD[7.1529639] → [11.441965:442000]
```
    monsters *m2 = &menv[targmon];
```

Replacement in crawl-ref/source/monstuff.cc at line 7612 [7.1396662]

B:BD[11.442377] → [11.442377:442431]

            behaviour_event( m2, ME_ALERT, MHITNOT );

[11.442377]

[11.442431]

            behaviour_event(m2, ME_ALERT, MHITNOT);

Fix an ancient bug where monsters couldn't swap positions vertically

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1742 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1745 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1749 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1801 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 1803 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1808 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6771 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 6773 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7060 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 7203 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 7210 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7397 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7430 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7433 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 7441 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7446 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7450 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7456 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7459 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7463 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7465 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7469 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7487 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7490 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7495 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7505 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7508 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 7510 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7514 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7518 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7526 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7528 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7534 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7538 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 7549 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7550 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7592 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7595 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 7600 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7612 [7.1396662]