fiddlerwoaroof/crawl - Change Y4WR4EIOFFXHRQI2PJAZWD4MVL6A7MNBHLN4KOV6BIKGGA7FXQTQC

[1748743] Fixed followers being misplaced.

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

Created by dshaligram on July 6, 2007

Y4WR4EIOFFXHRQI2PJAZWD4MVL6A7MNBHLN4KOV6BIKGGA7FXQTQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mtransit.cc at line 157 [4.8445]

B:BD[2.909] → [2.909:1061]

            if (m.flags & MF_TAKING_STAIRS)
                m.flags &= ~MF_TAKING_STAIRS;
            else
                m.flags |= MF_JUST_SUMMONED;

[2.909]

[4.11422]

            m.flags &= ~MF_TAKING_STAIRS;
            m.flags |= MF_JUST_SUMMONED;

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

B:BD[4.12553] → [4.12553:12607]

bool monsters::find_home_in(coord_def s, coord_def e)

[4.12553]

[4.12607]

bool monsters::check_set_valid_home(const coord_def &place,
                                    coord_def &chosen,
                                    int &nvalid) const

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

B:BD[4.12609] → [4.12609:12771]

    for (int iy = s.y; iy <= e.y; ++iy)
    {
        for (int ix = s.x; ix <= e.x; ++ix)
        {
            if (!in_bounds(ix, iy))
                continue;

[4.12609]

[4.12771]

    if (!in_bounds(place))
        return (false);
    if (place == you.pos())
        return (false);
    if (mgrd(place) != NON_MONSTER || grd(place) < DNGN_FLOOR)
        return (false);

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

B:BD[4.12772] → [4.12772:12850]

            if (ix == you.x_pos && iy == you.y_pos)
                continue;

[4.12772]

[4.12850]

    if (one_chance_in(++nvalid))
        chosen = place;

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

B:BD[4.12851] → [4.12851:12950]

            if (mgrd[ix][iy] != NON_MONSTER || grd[ix][iy] < DNGN_FLOOR)
                continue;

[4.12851]

[4.12950]

    return (true);
}

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

B:BD[4.12951] → [4.12951:13028]

            x = ix;
            y = iy;
            return (true);
        }

[4.12951]

[4.13028]

bool monsters::find_home_around(const coord_def &c, int radius)
{
    coord_def place(-1, -1);
    int nvalid = 0;
    for (int yi = -radius; yi <= radius; ++yi)
    {
        const coord_def c1(c.x - radius, c.y + yi);
        const coord_def c2(c.x + radius, c.y + yi);
        check_set_valid_home(c1, place, nvalid);
        check_set_valid_home(c2, place, nvalid);

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

[4.13035]

    for (int xi = -radius + 1; xi < radius; ++xi)
    {
        const coord_def c1(c.x + xi, c.y - radius);
        const coord_def c2(c.x + xi, c.y + radius);
        check_set_valid_home(c1, place, nvalid);
        check_set_valid_home(c2, place, nvalid);
    }
    if (nvalid)
    {
        x = place.x;
        y = place.y;
        return (true);
    }

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

B:BD[4.13100] → [4.13100:13330]

    return (find_home_in( you.pos() - coord_def(1, 1),
                          you.pos() + coord_def(1, 1) )
            || find_home_in( you.pos() - coord_def(6, 6),
                             you.pos() + coord_def(6, 6) ));

[4.13100]

[4.13330]

    for (int radius = 1; radius < 7; ++radius)
        if (find_home_around(you.pos(), radius))
            return (true);
    return (false);

Replacement in crawl-ref/source/files.cc at line 931 [5.3084589]

B:BD[6.9567] → [7.11575:11655]

            mprf( "%s is following.", str_monam(*fmenv, DESC_CAP_THE).c_str());

[6.9567]

[6.9641]

            mprf(MSGCH_DIAGNOSTICS, "%s is following.",
                 str_monam(*fmenv, DESC_CAP_THE).c_str());

Replacement in crawl-ref/source/externs.h at line 1037 [5.3270163]
B:BD[4.15684] → [4.15684:15733]
```
    bool find_home_in(coord_def s, coord_def e);
```
[4.15684]
[4.15733]
```
    bool find_home_around(const coord_def &c, int radius);
```

Insertion in crawl-ref/source/externs.h at line 1169 [5.3270163]

[3.23290]

[5.3281164]

    bool check_set_valid_home(const coord_def &place,
                              coord_def &chosen,
                              int &nvalid) const;