fiddlerwoaroof/crawl - Change 5XNQ3SSNBFXFNWA6DPM74W6FH65NX665P3DMH6YCWVFOPZTJSYCQC

More cleanups and fixes.

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

Created by haranp on July 23, 2008

5XNQ3SSNBFXFNWA6DPM74W6FH65NX665P3DMH6YCWVFOPZTJSYCQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 930 [9.16817]

B:BD[8.346] → [8.346:483]

        || s_type != S_SILENT && (silenced(you.x_pos, you.y_pos)
                                  || silenced(monster->x, monster->y)))

[8.346]

[10.22]

        || s_type != S_SILENT && (silenced(you.pos())
                                  || silenced(monster->pos())))

Replacement in crawl-ref/source/traps.cc at line 406 [12.5308]
B:BD[11.154] → [11.154:198]
```
        if (silenced(you.x_pos, you.y_pos))
```
[11.154]
[11.198]
```
        if (silenced(you.pos()))
```
Insertion in crawl-ref/source/stuff.h at line 51 [9.217090]
[13.103351]
[14.585]
```
// Various ways to iterate over things.
```

Insertion in crawl-ref/source/stuff.h at line 75 [9.217090]

[15.761]

};
class rectangle_iterator :
    public std::iterator<std::forward_iterator_tag, coord_def>
{
public:
    rectangle_iterator( const coord_def& corner1, const coord_def& corner2 );
    explicit rectangle_iterator( int x_border_dist, int y_border_dist = -1 );
    operator bool() const;
    coord_def operator *() const;
    const coord_def* operator->() const;
    rectangle_iterator& operator ++ ();
    rectangle_iterator operator ++ (int);    
private:
    coord_def current, topleft, bottomright;

Insertion in crawl-ref/source/stuff.h at line 122 [9.217090]

[9.218740]

[9.218961]

class adjacent_iterator : public radius_iterator
{
public:
    adjacent_iterator( const coord_def& pos = you.pos(),
                       bool _exclude_center = true ) :
        radius_iterator(pos, 1, true, false, _exclude_center) {}
};

Replacement in crawl-ref/source/stuff.h at line 183 [9.217090]

B:BD[9.222152] → [16.1440:1541]

bool silenced(int x, int y);
inline bool silenced(const coord_def &p) { return silenced(p.x, p.y); }

[9.222152]

[9.222568]

bool silenced(const coord_def& p);

Insertion in crawl-ref/source/stuff.cc at line 133 [9.224557]

[15.1706]

}
rectangle_iterator::rectangle_iterator( const coord_def& corner1,
                                        const coord_def& corner2 )
{
    topleft.x = std::min(corner1.x, corner2.x);
    topleft.y = std::min(corner1.y, corner2.y); // not really necessary
    bottomright.x = std::max(corner1.x, corner2.x);
    bottomright.y = std::max(corner1.y, corner2.y);
    current = topleft;
}
rectangle_iterator::rectangle_iterator( int x_border_dist, int y_border_dist )
{
    if ( y_border_dist < 0 )
        y_border_dist = x_border_dist;
    topleft.set( x_border_dist, y_border_dist );
    bottomright.set( GXM - x_border_dist, GYM - y_border_dist );
    current = topleft;
}
rectangle_iterator::operator bool() const
{
    return current.y > bottomright.y;
}
coord_def rectangle_iterator::operator *() const
{
    return current;
}
const coord_def* rectangle_iterator::operator->() const
{
    return &current;
}
rectangle_iterator& rectangle_iterator::operator ++()
{
    if ( current.x == bottomright.x )
    {
        current.x = topleft.x;
        current.y++;
    }
    else
    {
        current.x++;
    }
    return *this;

Insertion in crawl-ref/source/stuff.cc at line 183 [9.224557]

[15.1709]

[14.1397]

rectangle_iterator rectangle_iterator::operator++( int dummy )
{
    const rectangle_iterator copy = *this;
    ++(*this);
    return (copy);
}

Replacement in crawl-ref/source/stuff.cc at line 1234 [9.224557]
B:BD[9.240583] → [16.1869:1897]
```
bool silenced(int x, int y)
```
[9.240583]
[9.240613]
```
bool silenced(const coord_def& p)
```

Replacement in crawl-ref/source/stuff.cc at line 1236 [9.224557]

B:BD[9.240640] → [9.240640:240751]

B:BD[9.240751] → [17.4601:4624]

∅:D[17.4624] → [9.240772:240993]

B:BD[9.240772] → [9.240772:240993]

B:BD[9.240993] → [17.4625:4659]

∅:D[17.4659] → [9.241025:241039]

B:BD[9.241025] → [9.241025:241039]

B:BD[9.241039] → [17.4660:4684]

∅:D[17.4684] → [9.241061:241067]

B:BD[9.241061] → [9.241061:241067]

    if (you.duration[DUR_SILENCE] > 0
        && distance(x, y, you.x_pos, you.y_pos) <= 36)  // (6 * 6)
    {
        return (true);
    }
    else
    {
        //else // FIXME: implement, and let monsters cast, too
        //  for (int i = 0; i < MAX_SILENCES; i++)
        //  {
        //      if (distance(x, y, silencer[i].x, silencer[i].y) <= 36)
        //         return (true);
        //  }
        return (false);
    }

[9.240615]

[17.4685]

    // FIXME: implement for monsters
    return (you.duration[DUR_SILENCE] > 0 && distance(p, you.pos()) <= 6*6);

Replacement in crawl-ref/source/stuff.cc at line 1242 [9.224557]

B:BD[9.241213] → [9.241213:241278]

    return (!silenced(x, y) && !silenced(you.x_pos, you.y_pos));

[9.241189]

[17.4688]

    return (!silenced(coord_def(x, y)) && !silenced(you.pos()));

Replacement in crawl-ref/source/spl-cast.cc at line 602 [9.293070]
B:BD[9.306475] → [9.306475:306515]
```
    if (silenced(you.x_pos, you.y_pos))
```
[9.306475]
[9.306515]
```
    if (silenced(you.pos()))
```
Replacement in crawl-ref/source/spl-cast.cc at line 2380 [9.293070]
B:BD[18.5482] → [18.5482:5531]
```
            if (!silenced(you.x_pos, you.y_pos))
```
[18.5482]
[18.5531]
```
            if (!silenced(you.pos()))
```
Replacement in crawl-ref/source/spl-cast.cc at line 2609 [9.293070]
B:BD[18.10656] → [18.10656:10705]
```
            if (!silenced(you.x_pos, you.y_pos))
```
[18.10656]
[18.10705]
```
            if (!silenced(you.pos()))
```
Replacement in crawl-ref/source/spl-cast.cc at line 2805 [9.293070]
B:BD[18.15338] → [18.15338:15387]
```
            if (!silenced(you.x_pos, you.y_pos))
```
[18.15338]
[18.15387]
```
            if (!silenced(you.pos()))
```
Replacement in crawl-ref/source/spl-cast.cc at line 2930 [9.293070]
B:BD[18.18412] → [18.18412:18461]
```
            if (!silenced(you.x_pos, you.y_pos))
```
[18.18412]
[18.18461]
```
            if (!silenced(you.pos()))
```
Replacement in crawl-ref/source/spl-cast.cc at line 3245 [9.293070]
B:BD[18.26162] → [18.26162:26211]
```
            if (!silenced(you.x_pos, you.y_pos))
```
[18.26162]
[18.26211]
```
            if (!silenced(you.pos()))
```
Replacement in crawl-ref/source/spl-cast.cc at line 3384 [9.293070]
B:BD[18.30341] → [18.30341:30390]
```
            if (!silenced(you.x_pos, you.y_pos))
```
[18.30341]
[18.30390]
```
            if (!silenced(you.pos()))
```
Replacement in crawl-ref/source/spl-cast.cc at line 3487 [9.293070]
B:BD[18.33193] → [18.33193:33242]
```
            if (!silenced(you.x_pos, you.y_pos))
```
[18.33193]
[18.33242]
```
            if (!silenced(you.pos()))
```
Replacement in crawl-ref/source/spl-cast.cc at line 3607 [9.293070]
B:BD[18.36287] → [18.36287:36336]
```
            if (!silenced(you.x_pos, you.y_pos))
```
[18.36287]
[18.36336]
```
            if (!silenced(you.pos()))
```
Replacement in crawl-ref/source/spl-cast.cc at line 3620 [9.293070]
B:BD[18.36598] → [18.36598:36647]
```
            if (!silenced(you.x_pos, you.y_pos))
```
[18.36598]
[18.36647]
```
            if (!silenced(you.pos()))
```

Replacement in crawl-ref/source/spl-cast.cc at line 3640 [9.293070]

B:BD[18.37075] → [18.37075:37145]

                 silenced(you.x_pos, you.y_pos) ? "whips" : "howls");

[18.37075]

[18.37145]

                 silenced(you.pos()) ? "whips" : "howls");

Replacement in crawl-ref/source/spl-cast.cc at line 3730 [9.293070]
B:BD[18.39826] → [18.39826:39875]
```
            if (!silenced(you.x_pos, you.y_pos))
```
[18.39826]
[18.39875]
```
            if (!silenced(you.pos()))
```

Replacement in crawl-ref/source/spells4.cc at line 231 [9.436250]

B:BD[9.444019] → [9.444019:444083]

        if (!silenced(x, y) && !silenced(you.x_pos, you.y_pos))

[9.444019]

[13.142810]

        if (!silenced(coord_def(x, y)) && !silenced(you.pos()))

Replacement in crawl-ref/source/spells4.cc at line 308 [9.436250]
B:BD[9.445954] → [19.16657:16714]
```
    const bool silence = silenced(you.x_pos, you.y_pos);
```
[9.445954]
[9.446009]
```
    const bool silence = silenced(you.pos());
```

Replacement in crawl-ref/source/spells3.cc at line 1633 [9.531613]

B:BD[17.9327] → [17.9327:9396]

    if (!silenced(you.x_pos, you.y_pos)) // How did you manage that?

[17.9327]

[20.167]

    if (!silenced(you.pos())) // How did you manage that?

Replacement in crawl-ref/source/spells3.cc at line 1863 [9.531613]
B:BD[9.556776] → [9.556776:556823]
```
        if (!silenced( you.x_pos, you.y_pos ))
```
[9.556776]
[9.556823]
```
        if (!silenced( you.pos() ))
```

Replacement in crawl-ref/source/spells3.cc at line 1868 [9.531613]

B:BD[21.6428] → [22.1181:1251]

                     (!see_grid( pos.x, pos.y ) ? "distant " : "") );

[21.6428]

[17.9491]

                     (!see_grid( pos ) ? "distant " : "") );

Replacement in crawl-ref/source/spells1.cc at line 1694 [9.616635]
B:BD[9.642828] → [9.642828:642858]
```
void manage_fire_shield(void)
```
[9.642828]
[9.642858]
```
void manage_fire_shield()
```

Deletion in crawl-ref/source/spells1.cc at line 1700 [9.616635]

B:BD[9.642926] → [9.642926:642927]

B:BD[9.642927] → [7.13255:13370]


    for ( radius_iterator ri(you.pos(), 1); ri; ++ri )
    {
        if ( *ri == you.pos() )
            continue;

Replacement in crawl-ref/source/spells1.cc at line 1701 [9.616635]

B:BD[9.642955] → [7.13371:13516]

        if (!grid_is_solid(grd(*ri)) && env.cgrid(*ri) == EMPTY_CLOUD)
            place_cloud( CLOUD_FIRE, *ri, 1 + random2(6), KC_YOU );
    }

[9.642955]

[23.2704]

    // Place fire clouds all around you
    for ( adjacent_iterator ai; ai; ++ai )
        if (!grid_is_solid(grd(*ai)) && env.cgrid(*ai) == EMPTY_CLOUD)
            place_cloud( CLOUD_FIRE, *ai, 1 + random2(6), KC_YOU );

Replacement in crawl-ref/source/religion.cc at line 1986 [9.804403]
B:BD[24.253] → [24.253:293]
```
    if (silenced(you.x_pos, you.y_pos))
```
[24.193]
[24.293]
```
    if (silenced(you.pos()))
```

Replacement in crawl-ref/source/religion.cc at line 5504 [9.804403]

B:BD[25.4418] → [6.2534:2607]

    else if (you.religion == GOD_TROG && _magic_users_attitude_change())

[25.4418]

[26.3075]

    if (you.religion == GOD_TROG && _magic_users_attitude_change())

Replacement in crawl-ref/source/player.cc at line 2644 [9.962854]

B:BD[27.3583] → [27.3583:3679]

        || mon->asleep() || silenced(you.x_pos, you.y_pos)
        || silenced(mon->x, mon->y))

[27.3583]

[28.2664]

        || mon->asleep() || silenced(you.pos()) || silenced(mon->pos()))

Replacement in crawl-ref/source/player.cc at line 5828 [9.962854]
B:BD[29.211] → [29.211:243]
```
    if (silenced(x_pos, y_pos))
```
[29.211]
[29.243]
```
    if (silenced(this->pos()))
```

Replacement in crawl-ref/source/mstuff2.cc at line 150 [9.1340842]

B:BD[11.2044] → [11.2044:2117]

        if (!mons_friendly(monster) || silenced(monster->x, monster->y))

[11.2044]

[11.2117]

        if (!mons_friendly(monster) || silenced(monster->pos()))

Replacement in crawl-ref/source/mstuff2.cc at line 152 [9.1340842]

B:BD[11.2127] → [30.2568:2618]

∅:D[30.2618] → [11.2178:2230]

B:BD[11.2178] → [11.2178:2230]

            if (trapKnown && you.can_see(monster)
                && !silenced(you.x_pos, you.y_pos))

[11.2127]

[11.2230]

            if (trapKnown && you.can_see(monster) && !silenced(you.pos()))

Replacement in crawl-ref/source/mstuff2.cc at line 298 [9.1340842]

B:BD[9.1347759] → [9.1347759:1347857]

        if (!silenced(monster->x, monster->y)
                && !silenced(you.x_pos, you.y_pos))

[9.1347759]

[9.1347857]

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

Replacement in crawl-ref/source/mstuff2.cc at line 2472 [9.1340842]
B:BD[31.3382] → [31.3382:3423]
```
        && !silenced(chief->x, chief->y)
```
[31.3382]
[32.818]
```
        && !silenced(chief->pos())
```
Replacement in crawl-ref/source/monstuff.cc at line 1382 [9.1396662]
B:BD[9.1422254] → [9.1422254:1422288]
```
    mgrd[child->x][child->y] = k;
```
[9.1422254]
[9.1422288]
```
    mgrd(child->pos()) = k;
```

Replacement in crawl-ref/source/monstuff.cc at line 1386 [9.1396662]

B:BD[9.1422355] → [9.1422355:1422433]

        if (!silenced(parent->x, parent->y) || !silenced(child->x, child->y))

[9.1422355]

[13.418417]

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

Replacement in crawl-ref/source/monspeak.cc at line 225 [9.1558496]
B:BD[33.10440] → [33.10440:10481]
```
    if (silenced(monster->x, monster->y)
```
[33.10440]
[33.10481]
```
    if (silenced(monster->pos())
```
Replacement in crawl-ref/source/monspeak.cc at line 261 [9.1558496]
B:BD[33.10777] → [34.1361:1412]
∅:D[34.1412] → [33.10777:10819]
B:BD[33.10777] → [33.10777:10819]
```
    bool silence = silenced(you.x_pos, you.y_pos);
    if (silenced(monster->x, monster->y))
```
[33.10777]
[34.1413]
```
    bool silence = silenced(you.pos());
    if (silenced(monster->pos()))
```

Replacement in crawl-ref/source/mon-util.cc at line 4389 [9.1699344]

B:BD[35.15238] → [7.35813:35875]

            else if (!silenced(you.pos()) && !silenced(x, y))

[35.15238]

[20.2794]

            else if (player_can_hear(this->pos()))

Replacement in crawl-ref/source/misc.cc at line 1154 [9.1933596]

B:BD[36.6431] → [7.37784:37856]

            for ( radius_iterator ri(where, 1, true, false); ri; ++ri )

[36.6431]

[7.37856]

            for ( adjacent_iterator ai(where); ai; ++ai )

Deletion in crawl-ref/source/misc.cc at line 1156 [9.1933596]
B:BD[7.37870] → [7.37870:37954]
∅:D[37.2722] → [38.18617:18618]
∅:D[7.37954] → [38.18617:18618]
B:BD[39.6586] → [38.18617:18618]
```
                if ( *ri == where ) // current square
                    continue;
```

Replacement in crawl-ref/source/misc.cc at line 1157 [9.1933596]

B:BD[7.38014] → [7.38014:38080]

                if (grd(*ri) < DNGN_MINMOVE && !one_chance_in(3))

[7.38014]

[7.38080]

                if (grd(*ai) < DNGN_MINMOVE && !one_chance_in(3))

Replacement in crawl-ref/source/misc.cc at line 1160 [9.1933596]

B:BD[39.6786] → [7.38111:38166]

                maybe_bloodify_square(*ri, amount/15);

[39.6786]

[7.38166]

                maybe_bloodify_square(*ai, amount/15);

Replacement in crawl-ref/source/misc.cc at line 1181 [9.1933596]

B:BD[37.3024] → [7.38441:38505]

    for ( radius_iterator ri(where, 1, true, false); ri; ++ri )

[37.3024]

[7.38505]

    for ( adjacent_iterator ai(where, false); ai; ++ai )

Replacement in crawl-ref/source/misc.cc at line 1183 [9.1933596]
B:BD[7.38511] → [7.38511:38555]
```
        if (!allow_bleeding_on_square(*ri))
```
[7.38511]
[7.38555]
```
        if (!allow_bleeding_on_square(*ai))
```

Replacement in crawl-ref/source/misc.cc at line 1186 [9.1933596]

B:BD[39.7297] → [7.38578:38636]

        if (grd(*ri) < DNGN_MINMOVE && !one_chance_in(3))

[39.7297]

[7.38636]

        if (grd(*ai) < DNGN_MINMOVE && !one_chance_in(3))

Replacement in crawl-ref/source/misc.cc at line 1191 [9.1933596]

B:BD[7.38704] → [7.38704:38802]

            env.map(*ri).property = FPROP_BLOODY;
            _spatter_neighbours(*ri, chance+1);

[7.38704]

[37.3612]

            env.map(*ai).property = FPROP_BLOODY;
            _spatter_neighbours(*ai, chance+1);

Replacement in crawl-ref/source/message.cc at line 677 [9.1993826]
B:BD[40.408] → [41.5408:5447]
```
    if (silenced(you.x_pos, you.y_pos)
```
[40.408]
[41.5447]
```
    if (silenced(you.pos())
```
Replacement in crawl-ref/source/items.h at line 78 [9.2580284]
B:BD[42.3730] → [42.3730:3768]
```
void lose_item_stack( int x, int y );
```
[42.3730]
[9.2582493]
```
void lose_item_stack( const coord_def& where );
```
Replacement in crawl-ref/source/items.cc at line 588 [9.2584728]
B:BD[42.5410] → [42.5410:5447]
```
void lose_item_stack( int x, int y )
```
[42.5410]
[42.5447]
```
void lose_item_stack( const coord_def& where )
```
Replacement in crawl-ref/source/items.cc at line 590 [9.2584728]
B:BD[42.5449] → [43.3757:3813]
```
    for ( stack_iterator si(coord_def(x,y)); si; ++si )
```
[42.5449]
[9.2597609]
```
    for ( stack_iterator si(where); si; ++si )
```
Replacement in crawl-ref/source/items.cc at line 598 [9.2584728]
B:BD[42.5604] → [44.2637:2664]
```
    igrd[x][y] = NON_ITEM;
```
[42.5604]
[42.5604]
```
    igrd(where) = NON_ITEM;
```

Replacement in crawl-ref/source/items.cc at line 1928 [9.2584728]

B:BD[45.1485] → [45.1485:1555]

        && grid_altar_god(grd[you.x_pos][you.y_pos]) == you.religion)

[45.1485]

[45.1555]

        && grid_altar_god(grd(you.pos())) == you.religion)

Replacement in crawl-ref/source/item_use.cc at line 571 [9.2781507]

B:BD[9.2791344] → [40.2194:2251]

                    if (!silenced(you.x_pos, you.y_pos))

[9.2791344]

[46.6409]

                    if (!silenced(you.pos()))

Replacement in crawl-ref/source/item_use.cc at line 3506 [9.2781507]

B:BD[9.2843419] → [47.5736:5829]

    beam.aimed_at_feet =
        (beam.target_x == you.x_pos && beam.target_y == you.y_pos);

[9.2843419]

[47.5829]

    beam.aimed_at_feet = (beam.target() == you.pos());

Replacement in crawl-ref/source/item_use.cc at line 3612 [9.2781507]

B:BD[9.2845403] → [48.6551:6676]

        if (grd[you.x_pos][you.y_pos] >= DNGN_FOUNTAIN_BLUE
            && grd[you.x_pos][you.y_pos] <= DNGN_FOUNTAIN_BLOOD)

[9.2845403]

[49.5848768]

        if (grd(you.pos()) >= DNGN_FOUNTAIN_BLUE
            && grd(you.pos()) <= DNGN_FOUNTAIN_BLOOD)

Replacement in crawl-ref/source/item_use.cc at line 3711 [9.2781507]

B:BD[9.2846514] → [50.903:968]

    const dungeon_feature_type feat = grd[you.x_pos][you.y_pos];

[9.2846514]

[50.968]

    const dungeon_feature_type feat = grd(you.pos());

Replacement in crawl-ref/source/item_use.cc at line 3803 [9.2781507]
∅:D[51.4758] → [48.7445:7505]
∅:D[17.34711] → [48.7445:7505]
B:BD[52.106980] → [48.7445:7505]
```
            grd[you.x_pos][you.y_pos] = DNGN_FOUNTAIN_BLUE;
```
[51.4758]
[52.106981]
```
            grd(you.pos()) = DNGN_FOUNTAIN_BLUE;
```

Replacement in crawl-ref/source/item_use.cc at line 3812 [9.2781507]

∅:D[53.2917] → [48.7515:7590]

B:BD[48.7515] → [48.7515:7590]

        grd[you.x_pos][you.y_pos] = static_cast<dungeon_feature_type>(feat

[53.2917]

[48.7590]

        grd(you.pos()) = static_cast<dungeon_feature_type>(feat

Replacement in crawl-ref/source/item_use.cc at line 4122 [9.2781507]
B:BD[9.2857441] → [9.2857441:2857485]
```
        if (silenced(you.x_pos, you.y_pos))
```
[9.2857441]
[9.2857495]
```
        if (silenced(you.pos()))
```
Replacement in crawl-ref/source/item_use.cc at line 4269 [9.2781507]
B:BD[9.2859204] → [9.2859204:2859244]
```
    if (silenced(you.x_pos, you.y_pos))
```
[9.2859204]
[9.2859244]
```
    if (silenced(you.pos()))
```

Replacement in crawl-ref/source/it_use3.cc at line 79 [9.2870456]

B:BD[54.786] → [54.786:864]

        makes_noise = (one_chance_in(20) && !silenced(you.x_pos, you.y_pos));

[54.786]

[55.29153]

        makes_noise = (one_chance_in(20) && !silenced(you.pos()));

Deletion in crawl-ref/source/files.cc at line 980 [9.3084589]

∅:D[56.580] → [57.8785:8841]

B:BD[57.8785] → [57.8785:8841]

B:BD[57.8847] → [57.8847:8993]

    for (int i = you.x_pos - 1; i < you.x_pos + 2; i++)
        for (int j = you.y_pos - 1; j < you.y_pos + 2; j++)
        {
            if (i == you.x_pos && j == you.y_pos)
                continue;

Replacement in crawl-ref/source/files.cc at line 981 [9.3084589]

B:BD[57.8994] → [57.8994:9063]

            if (mgrd[i][j] == NON_MONSTER)
                continue;

[57.8994]

[57.9063]

    // Handle nearby ghosts.
    for ( adjacent_iterator ai; ai; ++ai )
    {
        if (mgrd(*ai) == NON_MONSTER)
            continue;

Replacement in crawl-ref/source/files.cc at line 987 [9.3084589]
B:BD[57.9064] → [57.9064:9113]
```
            monsters *fmenv = &menv[mgrd[i][j]];
```
[57.9064]
[57.9113]
```
        monsters *fmenv = &menv[mgrd(*ai)];
```

Replacement in crawl-ref/source/files.cc at line 989 [9.3084589]

B:BD[57.9114] → [57.9114:9388]

            if (fmenv->type == MONS_PLAYER_GHOST
                && fmenv->hit_points < fmenv->max_hit_points / 2)
            {
                mpr("The ghost fades into the shadows.");
                monster_teleport(fmenv, true);
                continue;
            }

[57.9114]

[58.4188]

        if (fmenv->type == MONS_PLAYER_GHOST
            && fmenv->hit_points < fmenv->max_hit_points / 2)
        {
            mpr("The ghost fades into the shadows.");
            monster_teleport(fmenv, true);

Insertion in crawl-ref/source/files.cc at line 995 [9.3084589]
[58.4198]
[57.9544]
```
    }
```

Replacement in crawl-ref/source/files.cc at line 1218 [9.3084589]

∅:D[3.2739] → [59.1769:1836]

B:BD[9.3104615] → [59.1769:1836]

∅:D[59.1836] → [60.275:348]

B:BD[9.3104666] → [60.275:348]

    if (make_changes && mgrd[you.x_pos][you.y_pos] != NON_MONSTER)
        monster_teleport(&menv[mgrd[you.x_pos][you.y_pos]], true, true);

[3.2739]

[9.3104894]

    if (make_changes && mgrd(you.pos()) != NON_MONSTER)
        monster_teleport(&menv[mgrd(you.pos())], true, true);

Replacement in crawl-ref/source/effects.cc at line 1863 [9.3382105]

B:BD[11.3488] → [11.3488:3550]

    if (silenced(you.x_pos, you.y_pos) || you.cannot_speak())

[11.3488]

[11.3550]

    if (silenced(you.pos()) || you.cannot_speak())

Deletion in crawl-ref/source/effects.cc at line 2075 [9.3382105]
∅:D[61.3643] → [62.9817:9858]
∅:D[63.4858] → [62.9817:9858]
B:BD[62.9817] → [62.9817:9858]
```
    const int radius2 = radius * radius;
```

Replacement in crawl-ref/source/effects.cc at line 2078 [9.3382105]

B:BD[61.3826] → [64.3918:4020]

    for (int x = X_BOUND_1; x <= X_BOUND_2; ++x)
        for (int y = Y_BOUND_1; y <= Y_BOUND_2; ++y)

[61.3826]

[62.9970]

    for ( radius_iterator ri(you.pos(), radius, false, false); ri; ++ri )
    {
        const dungeon_feature_type grid = grd(*ri);
        
        if (grid == DNGN_ROCK_WALL
            || grid == DNGN_STONE_WALL
            || grid == DNGN_PERMAROCK_WALL )

Replacement in crawl-ref/source/effects.cc at line 2086 [9.3382105]

B:BD[62.9980] → [64.4021:4082]

∅:D[64.4082] → [62.10043:10057]

B:BD[62.10043] → [62.10043:10057]

B:BD[62.10057] → [61.3827:3882]

B:BD[61.3882] → [63.4859:4860]

∅:D[63.4860] → [61.3899:4235]

B:BD[61.3899] → [61.3899:4235]

∅:D[61.4235] → [62.10394:10408]

B:BD[62.10394] → [62.10394:10408]

            if (distance(x,y,you.x_pos,you.y_pos) < radius2)
            {
                dungeon_feature_type grid = grd[x][y];
                if (grid == DNGN_ROCK_WALL
                    || grid == DNGN_STONE_WALL
                    || grid == DNGN_PERMAROCK_WALL )
                {
                    grd[x][y]
                        = static_cast<dungeon_feature_type>(grid + clear_plus);
                    something_happened = true;
                }
            }

[62.9980]

[62.10408]

            grd(*ri)
                = static_cast<dungeon_feature_type>(grid + clear_plus);
            something_happened = true;

Insertion in crawl-ref/source/effects.cc at line 2090 [9.3382105]
[62.10418]
[63.4861]
```
    }
```

Replacement in crawl-ref/source/effects.cc at line 2708 [9.3382105]

B:BD[65.4915] → [65.4915:4992]

        if (grid_distance(mon->x, mon->y, mon->target_x, mon->target_y) < 3)

[65.4915]

[65.4992]

        if (grid_distance(mon->pos(), mon->target_pos()) < 3)

Replacement in crawl-ref/source/effects.cc at line 2713 [9.3382105]
∅:D[66.4490] → [65.5116:5184]
B:BD[65.5116] → [65.5116:5184]
```
            if (mon->x == mon->target_x && mon->y == mon->target_y)
```
[66.4490]
[65.5184]
```
            if (mon->pos() == mon->target_pos())
```

Replacement in crawl-ref/source/effects.cc at line 2715 [9.3382105]

B:BD[65.5198] → [65.5198:5262]

                if (you.x_pos != mon->x || you.y_pos != mon->y)

[65.5198]

[65.5262]

                if (you.pos() != mon->pos())

Replacement in crawl-ref/source/directn.cc at line 670 [9.3697945]
∅:D[49.5934364] → [67.9819:9898]
B:BD[68.1110] → [67.9819:9898]
```
        if (target_unshifted && moves.tx == you.x_pos && moves.ty == you.y_pos
```
[49.5934364]
[67.9898]
```
        if (target_unshifted && moves.target() == you.pos()
```

Replacement in crawl-ref/source/directn.cc at line 688 [9.3697945]

B:BD[69.495] → [70.3897:3961]

            if (moves.tx == you.x_pos && moves.ty == you.y_pos)

[69.495]

[69.561]

            if (moves.target() == you.pos())

Replacement in crawl-ref/source/directn.cc at line 932 [9.3697945]

B:BD[71.9328] → [72.21677:21746]

            else if (moves.tx == you.x_pos && moves.ty == you.y_pos)

[71.9328]

[72.21746]

            else if (moves.target() == you.pos())

Replacement in crawl-ref/source/directn.cc at line 1108 [9.3697945]

B:BD[73.10994] → [73.10994:11060]

                && moves.tx == you.x_pos && moves.ty == you.y_pos

[73.10994]

[73.11060]

                && moves.target() == you.pos()

Replacement in crawl-ref/source/directn.cc at line 1216 [9.3697945]

B:BD[9.3704949] → [71.12325:12392]

    moves.isMe = (moves.tx == you.x_pos && moves.ty == you.y_pos);

[9.3704387]

[74.320]

    moves.isMe = (moves.target() == you.pos());

Replacement in crawl-ref/source/directn.cc at line 1869 [9.3697945]

∅:D[75.19112] → [76.1524:1578]

B:BD[76.1524] → [76.1524:1578]

B:BD[76.1578] → [77.7761:7825]

    if ((grd[you.x_pos][you.y_pos] == DNGN_DEEP_WATER
            || grd[you.x_pos][you.y_pos] == DNGN_SHALLOW_WATER)

[75.19112]

[76.1638]

    if ((grd(you.pos()) == DNGN_DEEP_WATER
            || grd(you.pos()) == DNGN_SHALLOW_WATER)

Deletion in crawl-ref/source/delay.cc at line 594 [9.3963459]
B:BD[78.7012] → [78.7012:7045]
```
    int mid;
    monsters *mons;
```

Replacement in crawl-ref/source/delay.cc at line 596 [9.3963459]

B:BD[78.7046] → [78.7046:7250]

    for (int x = you.x_pos - 8; x <= you.x_pos + 8; x++)
       for (int y = you.y_pos - 8; y <= you.y_pos + 8; y++)
       {
            if (!in_bounds(x,y) || !see_grid(x, y))
                continue;

[78.7046]

[78.7250]

    for ( radius_iterator ri(you.pos(), 8); ri; ++ri )
    {
        if ( mgrd(*ri) == NON_MONSTER )
            continue;

Replacement in crawl-ref/source/delay.cc at line 601 [9.3963459]

B:BD[78.7251] → [78.7251:7343]

            mid = mgrd[x][y];
            if (mid == NON_MONSTER)
                continue;

[78.7251]

[78.7343]

        found_monsters = true;

Replacement in crawl-ref/source/delay.cc at line 603 [9.3963459]
B:BD[78.7344] → [78.7344:7375]
B:BD[78.7375] → [79.4931:5003]
∅:D[79.5003] → [78.7375:7376]
∅:D[80.5274] → [78.7375:7376]
B:BD[78.7375] → [78.7375:7376]
B:BD[78.7376] → [81.5751:5803]
B:BD[81.5803] → [75.23982:24026]
∅:D[75.24026] → [80.5275:5301]
B:BD[78.7470] → [80.5275:5301]
∅:D[80.5301] → [78.7497:7498]
B:BD[78.7497] → [78.7497:7498]
```
            mons = &menv[mid];
            if (!found_monsters)
                found_monsters = true;
            // Can not be affected in these states.
            if (_recite_mons_useless(mons))
                continue;
```
[78.7344]
[80.5302]
```
        // Check if audience can listen.
        if (!_recite_mons_useless( &menv[mgrd(*ri)] ) )
```
Replacement in crawl-ref/source/delay.cc at line 606 [9.3963459]
∅:D[80.5326] → [78.7525:7534]
B:BD[78.7525] → [78.7525:7534]
```
      }
```
[80.5326]
[78.7534]
```
    }
    
```

Replacement in crawl-ref/source/delay.cc at line 609 [9.3963459]

B:BD[78.7559] → [82.2678:2705]

∅:D[82.2705] → [80.5355:5489]

B:BD[80.5355] → [80.5355:5489]

      if (!found_monsters)
          mprf(MSGCH_DIAGNOSTICS, "No audience found!");
      else
          mprf(MSGCH_DIAGNOSTICS, "No sensible audience found!");

[78.7559]

[78.7608]

    if (!found_monsters)
        mprf(MSGCH_DIAGNOSTICS, "No audience found!");
    else
        mprf(MSGCH_DIAGNOSTICS, "No sensible audience found!");

Replacement in crawl-ref/source/delay.cc at line 614 [9.3963459]
B:BD[78.7615] → [78.7615:7616]
[78.7615]
[81.5804]
```
    
```

Replacement in crawl-ref/source/decks.cc at line 1548 [9.3987460]

B:BD[83.5093] → [51.16793:16891]

∅:D[51.16891] → [83.5201:5211]

B:BD[83.5201] → [83.5201:5211]

B:BD[83.5211] → [51.16892:16928]

∅:D[84.3109] → [83.5266:5292]

∅:D[51.16928] → [83.5266:5292]

B:BD[83.5266] → [83.5266:5292]

B:BD[83.5292] → [51.16929:16981]

∅:D[51.16981] → [83.5330:5443]

B:BD[83.5330] → [83.5330:5443]

B:BD[83.5443] → [51.16982:17018]

∅:D[51.17018] → [83.5481:5507]

B:BD[83.5481] → [83.5481:5507]

    for (int dx = -radius; dx <= radius; ++dx)
        for (int dy = -radius; dy <= radius; ++dy)
        {
            if (dx == 0 && dy == 0)
                continue;
            if (dx*dx + dy*dy > radius*radius + 1)
                continue;
            const int rx = you.x_pos + dx;
            const int ry = you.y_pos + dy;
            if (!in_bounds(rx, ry))
                continue;

[83.5093]

[85.10080]

    for (radius_iterator ri(you.pos(), radius, false, false, false); ri; ++ri)
    {
        if ( *ri == you.pos() )
            continue;

Replacement in crawl-ref/source/decks.cc at line 1553 [9.3987460]

B:BD[85.10081] → [7.52208:52288]

∅:D[7.52288] → [51.17088:17139]

B:BD[51.17088] → [51.17088:17139]

∅:D[51.17139] → [83.5630:5644]

∅:D[86.59193] → [83.5630:5644]

B:BD[83.5630] → [83.5630:5644]

B:BD[83.5644] → [51.17140:17191]

∅:D[51.17191] → [87.534:693]

B:BD[87.534] → [87.534:693]

∅:D[87.693] → [83.5702:5716]

B:BD[83.5702] → [83.5702:5716]

            if (grd[rx][ry] == DNGN_FLOOR && trap_at_xy(coord_def(rx,ry)) == -1
                && one_chance_in(4 - power_level))
            {
                if (you.level_type == LEVEL_ABYSS)
                    grd[rx][ry] = coinflip() ? DNGN_DEEP_WATER : DNGN_LAVA;
                else
                    place_specific_trap(rx, ry, TRAP_RANDOM);
            }

[85.10081]

[88.960]

        if (grd(*ri) == DNGN_FLOOR && trap_at_xy(*ri) == -1
            && one_chance_in(4 - power_level))
        {
            if (you.level_type == LEVEL_ABYSS)
                grd(*ri) = coinflip() ? DNGN_DEEP_WATER : DNGN_LAVA;
            else
                place_specific_trap(ri->x, ri->y, TRAP_RANDOM);

Insertion in crawl-ref/source/decks.cc at line 1561 [9.3987460]
[88.970]
[88.976]
```
    }
```

Replacement in crawl-ref/source/decks.cc at line 2187 [9.3987460]

B:BD[14.6853] → [14.6853:6923]

    radius_iterator ri(center, radius, false);
    for ( ; ri; ++ri )

[14.6853]

[14.6923]

    for ( radius_iterator ri(center, radius, false); ri; ++ri )

Replacement in crawl-ref/source/decks.cc at line 2209 [9.3987460]

B:BD[14.7381] → [14.7381:7451]

    radius_iterator ri(center, radius, false);
    for ( ; ri; ++ri )

[14.7381]

[14.7451]

    for ( radius_iterator ri(center, radius, false); ri; ++ri )

Replacement in crawl-ref/source/decks.cc at line 2250 [9.3987460]

∅:D[75.27448] → [14.9299:9386]

B:BD[14.9299] → [14.9299:9386]

        radius_iterator ri( you.pos(), LOS_RADIUS, false );
        for ( ; ri; ++ri )

[75.27448]

[14.9386]

        for ( radius_iterator ri( you.pos(), LOS_RADIUS, false ); ri; ++ri )

Replacement in crawl-ref/source/decks.cc at line 2302 [9.3987460]
∅:D[75.27634] → [89.7063:7119]
B:BD[89.7063] → [89.7063:7119]
```
    if (is_critical_feature(grd[you.x_pos][you.y_pos]))
```
[75.27634]
[89.7119]
```
    if (is_critical_feature(grd(you.pos())))
```

Replacement in crawl-ref/source/decks.cc at line 2379 [9.3987460]

B:BD[90.2137] → [90.2137:2199]

                grd[pos.x][pos.y] = RANDOM_ELEMENT(statfeat);

[90.2137]

[90.2199]

                grd(pos) = RANDOM_ELEMENT(statfeat);

Replacement in crawl-ref/source/decks.cc at line 2388 [9.3987460]
B:BD[51.20862] → [51.20862:20915]
```
        if (grd[you.x_pos][you.y_pos] == DNGN_FLOOR)
```
[51.20862]
[90.2419]
```
        if (grd(you.pos()) == DNGN_FLOOR)
```

Replacement in crawl-ref/source/decks.cc at line 2392 [9.3987460]

B:BD[91.2737] → [91.2737:2798]

            grd[you.x_pos][you.y_pos] = altar_for_god(rgod);

[91.2737]

[90.2591]

            grd(you.pos()) = altar_for_god(rgod);

Replacement in crawl-ref/source/decks.cc at line 2394 [9.3987460]

B:BD[90.2592] → [51.20967:21024]

            if (grd[you.x_pos][you.y_pos] != DNGN_FLOOR)

[90.2592]

[90.2651]

            if (grd(you.pos()) != DNGN_FLOOR)

Replacement in crawl-ref/source/decks.cc at line 2534 [9.3987460]
B:BD[92.2134] → [2.291:327]
```
    int chosen_x = 0, chosen_y = 0;
```
[92.2134]
[92.2162]
```
    coord_def chosen_spot;
```
Insertion in crawl-ref/source/decks.cc at line 2553 [9.3987460]
[51.21230]
[85.10120]
```
        coord_def delta(dx,dy);
```

Replacement in crawl-ref/source/decks.cc at line 2559 [9.3987460]

B:BD[86.61944] → [7.52289:52365]

            cur_try = random_monster_at_grid(you.pos() + coord_def(dx,dy));

[86.61944]

[86.61945]

            cur_try = random_monster_at_grid(you.pos() + delta);

Replacement in crawl-ref/source/decks.cc at line 2567 [9.3987460]

B:BD[92.2820] → [92.2820:2888]

            chosen_x = you.x_pos;
            chosen_y = you.y_pos;

[92.2820]

[92.2888]

            chosen_spot = you.pos();

Replacement in crawl-ref/source/decks.cc at line 2579 [9.3987460]

B:BD[93.3079] → [93.3079:3131]

                  3, coord_def(chosen_x, chosen_y),

[93.3079]

[4.2679]

                  3, chosen_spot,

Deletion in crawl-ref/source/debug.cc at line 500 [9.4016436]
B:BD[94.6695] → [94.6695:6742]
```
    int x = you.x_pos;
    int y = you.y_pos;
```

Replacement in crawl-ref/source/debug.cc at line 504 [9.4016436]

B:BD[8.11941] → [94.6843:6909]

    coord_def place = find_newmons_square(type, coord_def(x, y));

[8.11941]

[5.2895]

    coord_def place = find_newmons_square(type, you.pos());

Replacement in crawl-ref/source/debug.cc at line 509 [9.4016436]

B:BD[5.3052] → [5.3052:3123]

        place = find_newmons_square(MONS_PROGRAM_BUG, coord_def(x,y));

[5.3052]

[5.3123]

        place = find_newmons_square(MONS_PROGRAM_BUG, you.pos());

Replacement in crawl-ref/source/debug.cc at line 512 [9.4016436]

∅:D[5.3130] → [94.6909:6998]

B:BD[94.6909] → [94.6909:6998]

    if (in_bounds(place))
    {
        x = place.x;
        y = place.y;
    }
    else

[5.3130]

[94.6998]

    if (!in_bounds(place))

Replacement in crawl-ref/source/debug.cc at line 523 [9.4016436]

B:BD[85.10286] → [94.7157:7227]

    if (!dgn_place_monster(mspec, you.your_level, x, y, true, false))

[85.10286]

[33.36447]

    if (!dgn_place_monster(mspec, you.your_level,
                           place.x, place.y, true, false))

Replacement in crawl-ref/source/debug.cc at line 533 [9.4016436]
B:BD[33.36609] → [95.832:874]
```
        unsigned short mid  = mgrd[x][y];
```
[33.36609]
[33.36650]
```
        unsigned short mid = mgrd(place);
```
Replacement in crawl-ref/source/debug.cc at line 689 [9.4016436]
B:BD[9.4031978] → [96.8711:8751]
```
    grd[you.x_pos][you.y_pos] = stairs;
```
[9.4031978]
[96.8751]
```
    grd(you.pos()) = stairs;
```
Replacement in crawl-ref/source/debug.cc at line 1984 [9.4016436]
B:BD[97.1912] → [97.1912:1968]
```
    if (grid_destroys_items(grd[you.x_pos][you.y_pos]))
```
[97.1912]
[97.1968]
```
    if (grid_destroys_items(grd(you.pos())))
```
Replacement in crawl-ref/source/debug.cc at line 2810 [9.4016436]
B:BD[9.4062912] → [98.16430:16466]
```
        grd[you.x_pos][you.y_pos] =
```
[9.4062912]
[99.3514]
```
        grd(you.pos()) =
```
Replacement in crawl-ref/source/debug.cc at line 3402 [9.4016436]
B:BD[13.1038244] → [13.1038244:1038288]
```
    int gridch = grd[you.x_pos][you.y_pos];
```
[13.1038244]
[13.1038288]
```
    int gridch = grd(you.pos());
```
Replacement in crawl-ref/source/debug.cc at line 3468 [9.4016436]
B:BD[13.1039557] → [13.1039557:1039601]
```
    int gridch = grd[you.x_pos][you.y_pos];
```
[13.1039557]
[13.1039601]
```
    int gridch = grd(you.pos());
```
Replacement in crawl-ref/source/debug.cc at line 3828 [9.4016436]
B:BD[33.38418] → [33.38418:38462]
```
        if (silenced(you.x_pos, you.y_pos))
```
[33.38302]
[33.38462]
```
        if (silenced(you.pos()))
```
Replacement in crawl-ref/source/debug.cc at line 3830 [9.4016436]
B:BD[33.38533] → [34.3115:3158]
```
        else if (silenced(mon->x, mon->y))
```
[33.38533]
[34.3158]
```
        else if (silenced(mon->pos()))
```

Replacement in crawl-ref/source/debug.cc at line 3841 [9.4016436]

B:BD[33.38736] → [33.38736:38809]

        if (silenced(you.x_pos, you.y_pos) && !silenced(mon->x, mon->y))

[33.38736]

[100.11680]

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

Replacement in crawl-ref/source/debug.cc at line 3846 [9.4016436]
∅:D[100.11701] → [33.38924:39002]
B:BD[33.38924] → [33.38924:39002]
```
        else if (!silenced(you.x_pos, you.y_pos) && silenced(mon->x, mon->y))
```
[100.11701]
[33.39002]
```
        else if (!silenced(you.pos()) && silenced(mon->pos()))
```

Replacement in crawl-ref/source/debug.cc at line 3848 [9.4016436]

B:BD[33.39077] → [33.39077:39154]

        else if (silenced(you.x_pos, you.y_pos) && silenced(mon->x, mon->y))

[33.39077]

[100.11702]

        else if (silenced(you.pos()) && silenced(mon->pos()))

Replacement in crawl-ref/source/cloud.cc at line 88 [9.4095717]

B:BD[101.4288] → [7.53227:53325]

    radius_iterator ri(coord_def(cloud.x, cloud.y), 1, true, false, true);
    for ( ; ri; ++ri )

[101.4288]

[101.4326]

    for ( adjacent_iterator ai(cloud.pos()); ai; ++ai )

Replacement in crawl-ref/source/cloud.cc at line 93 [9.4095717]

B:BD[101.4468] → [7.53387:53567]

        if (!in_bounds(*ri)
            || env.cgrid(*ri) != EMPTY_CLOUD
            || grid_is_solid(grd(*ri))
            || is_sanctuary(*ri) && !is_harmless_cloud(cloud.type))

[101.4468]

[7.53567]

        if (!in_bounds(*ai)
            || env.cgrid(*ai) != EMPTY_CLOUD
            || grid_is_solid(grd(*ai))
            || is_sanctuary(*ai) && !is_harmless_cloud(cloud.type))

Replacement in crawl-ref/source/cloud.cc at line 105 [9.4095717]

B:BD[7.53740] → [7.53740:53806]

        _place_new_cloud( cloud.type, *ri, newdecay, cloud.whose,

[7.53740]

[7.53806]

        _place_new_cloud( cloud.type, *ai, newdecay, cloud.whose,

Replacement in crawl-ref/source/cloud.cc at line 397 [9.4095717]
B:BD[102.4785] → [102.4785:4831]
```
    int cl = env.cgrid[you.x_pos][you.y_pos];
```
[102.4785]
[102.4831]
```
    int cl = env.cgrid(you.pos());
```

Replacement in crawl-ref/source/acr.cc at line 825 [9.4397395]

B:BD[9.4413601] → [9.4413601:4413661]

        grd[you.x_pos][you.y_pos] = DNGN_ENTER_PANDEMONIUM;

[9.4413601]

[103.4214]

        grd(you.pos()) = DNGN_ENTER_PANDEMONIUM;

Replacement in crawl-ref/source/acr.cc at line 852 [9.4397395]

B:BD[104.12868] → [104.12868:12929]

        grd[you.x_pos][you.y_pos] = DNGN_ENTER_PORTAL_VAULT;

[104.12868]

[51.23224]

        grd(you.pos()) = DNGN_ENTER_PORTAL_VAULT;

Replacement in crawl-ref/source/acr.cc at line 861 [9.4397395]
B:BD[9.4413691] → [9.4413691:4413749]
```
        grd[you.x_pos][you.y_pos] = DNGN_ENTER_LABYRINTH;
```
[9.4413691]
[105.10347]
```
        grd(you.pos()) = DNGN_ENTER_LABYRINTH;
```
Deletion in crawl-ref/source/acr.cc at line 942 [9.4397395]
B:BD[9.4415068] → [106.1825:1835]
```
        {
```

Replacement in crawl-ref/source/acr.cc at line 943 [9.4397395]

B:BD[106.1881] → [106.1881:1998]

                grd[you.x_pos][you.y_pos] =
                    static_cast<dungeon_feature_type>( feat );
        }

[106.1881]

[9.4415121]

                grd(you.pos()) = static_cast<dungeon_feature_type>( feat );

Replacement in crawl-ref/source/acr.cc at line 3102 [9.4397395]
B:BD[13.1270859] → [13.1270859:1270915]
```
    if (env.cgrid[you.x_pos][you.y_pos] != EMPTY_CLOUD)
```
[13.1270859]
[13.1270915]
```
    if (env.cgrid(you.pos()) != EMPTY_CLOUD)
```

Deletion in crawl-ref/source/acr.cc at line 3437 [9.4397395]

B:BD[107.3068] → [108.8433:8459]

∅:D[108.8459] → [107.3086:3319]

B:BD[107.3086] → [107.3086:3319]

    int _dx = 0, _dy = 0;
    for (int x = -1; x <= 1; x++)
        for (int y = -1; y <= 1; y++)
            if (grd[you.x_pos + x][you.y_pos + y] == feat)
            {
                num++;
                _dx = x;
                _dy = y;
            }

Replacement in crawl-ref/source/acr.cc at line 3438 [9.4397395]
B:BD[107.3320] → [107.3320:3338]
```
    if (num == 1)
```
[107.3320]
[107.3338]
```
    for ( adjacent_iterator ai(you.pos(), false); ai; ++ai )
```

Replacement in crawl-ref/source/acr.cc at line 3440 [9.4397395]

B:BD[107.3344] → [107.3344:3380]

        dx = _dx;
        dy = _dy;

[107.3344]

[107.3380]

        if ( grd(*ai) == feat )
        {
            num++;
            dx = ai->x - you.x_pos;
            dy = ai->y - you.y_pos;
        }

Replacement in crawl-ref/source/acr.cc at line 3574 [9.4397395]
∅:D[109.4803] → [110.3048:3096]
∅:D[111.11874] → [110.3048:3096]
∅:D[51.25136] → [110.3048:3096]
B:BD[110.3048] → [110.3048:3096]
```
            if (silenced(you.x_pos, you.y_pos))
```
[51.25136]
[109.4818]
```
            if (silenced(you.pos()))
```
Deletion in crawl-ref/source/acr.cc at line 3691 [9.4397395]
B:BD[112.4190] → [112.4190:4247]
```
        const coord_def you_coord(you.x_pos, you.y_pos);
```
Replacement in crawl-ref/source/acr.cc at line 3695 [9.4397395]
B:BD[112.4390] → [112.4390:4439]
```
            if (mgrd[dc.x][dc.y] != NON_MONSTER)
```
[112.4390]
[112.4439]
```
            if (mgrd(dc) != NON_MONSTER)
```

Replacement in crawl-ref/source/acr.cc at line 3699 [9.4397395]

∅:D[51.25167] → [113.4060:4130]

B:BD[112.4560] → [113.4060:4130]

                if (!player_monster_visible(&menv[mgrd[dc.x][dc.y]]))

[51.25167]

[113.4130]

                if (!player_monster_visible(&menv[mgrd(dc)]))

Replacement in crawl-ref/source/acr.cc at line 3712 [9.4397395]
B:BD[9.4467488] → [112.4731:4777]
```
            if (igrd[dc.x][dc.y] != NON_ITEM)
```
[9.4467488]
[112.4777]
```
            if (igrd(dc) != NON_ITEM)
```
Replacement in crawl-ref/source/acr.cc at line 3720 [9.4397395]
B:BD[112.4967] → [112.4967:5000]
```
            if (you_coord == dc)
```
[112.4967]
[112.5000]
```
            if (you.pos() == dc)
```
Replacement in crawl-ref/source/acr.cc at line 3731 [9.4397395]
B:BD[110.3430] → [110.3430:3478]
```
            if (silenced(you.x_pos, you.y_pos))
```
[110.3430]
[109.5388]
```
            if (silenced(you.pos()))
```

Replacement in crawl-ref/source/acr.cc at line 3742 [9.4397395]

B:BD[110.3701] → [110.3701:3775]

        else if (one_chance_in(skill) && !silenced(you.x_pos, you.y_pos))

[110.3701]

[9.4467846]

        else if (one_chance_in(skill) && !silenced(you.pos()))

Insertion in crawl-ref/source/abyss.cc at line 44 [9.4482606]
[114.28063]
[115.376]
```
const coord_def abyss_center(45,35);
```
Deletion in crawl-ref/source/abyss.cc at line 87 [9.4482606]
B:BD[9.4483200] → [9.4483200:4483317]
B:BD[9.4483317] → [114.28064:28065]
```
    int i, j;                   // loop variables
    int temp_rand;              // probability determination {dlb}
```

Replacement in crawl-ref/source/abyss.cc at line 92 [9.4482606]

B:BD[9.4483318] → [9.4483318:4483354]

B:BD[9.4483360] → [9.4483360:4483449]

    for (i = 5; i < (GXM - 5); i++)
        for (j = 5; j < (GYM - 5); j++)
        {
            temp_rand = random2(4000);

[9.4483318]

[9.4483449]

    for ( rectangle_iterator ri(5); ri; ++ri )
    {
        grd(*ri) =
            static_cast<dungeon_feature_type>(
                random_choose_weighted(3000, DNGN_FLOOR,
                                        600, DNGN_ROCK_WALL,
                                        300, DNGN_STONE_WALL,
                                        100, DNGN_METAL_WALL,
                                          1, DNGN_CLOSED_DOOR,
                                          0));
    }

Deletion in crawl-ref/source/abyss.cc at line 104 [9.4482606]

B:BD[9.4483450] → [9.4483450:4483829]

            grd[i][j] = ((temp_rand > 999) ? DNGN_FLOOR :       // 75.0%
                         (temp_rand > 400) ? DNGN_ROCK_WALL :   // 15.0%
                         (temp_rand > 100) ? DNGN_STONE_WALL :  //  7.5%
                         (temp_rand >   0) ? DNGN_METAL_WALL    //  2.5%
                                           : DNGN_CLOSED_DOOR); // 1 in 4000
        }

Replacement in crawl-ref/source/abyss.cc at line 111 [9.4482606]

B:BD[116.14347] → [117.7895:7936]

B:BD[117.7936] → [64.4538:4602]

        grd[45][35] = DNGN_ALTAR_LUGONU;
        _place_feature_near( coord_def(45, 35), LOS_RADIUS + 2,

[116.14347]

[64.4602]

        grd(abyss_center) = DNGN_ALTAR_LUGONU;
        _place_feature_near( abyss_center, LOS_RADIUS + 2,

Replacement in crawl-ref/source/abyss.cc at line 117 [9.4482606]
B:BD[117.8022] → [117.8022:8056]
```
        grd[45][35] = DNGN_FLOOR;
```
[117.8022]
[117.8056]
```
        grd(abyss_center) = DNGN_FLOOR;
```

Replacement in crawl-ref/source/abyss.cc at line 120 [9.4482606]

B:BD[117.8096] → [117.8096:8160]

            _place_feature_near( coord_def(45, 35), LOS_RADIUS,

[117.8096]

[117.8160]

            _place_feature_near( abyss_center, LOS_RADIUS,

Replacement in crawl-ref/source/abyss.cc at line 158 [9.4482606]

B:BD[118.4604] → [75.39798:39910]

static void _generate_area(int gx1, int gy1, int gx2, int gy2,
                           bool spatter = false)

[118.4604]

[9.4484052]

static void _generate_area(const coord_def& topleft,
                           const coord_def& bottomright, bool spatter = false)

Replacement in crawl-ref/source/abyss.cc at line 176 [9.4482606]
B:BD[9.4484345] → [98.16952:17003]
```
    FixedVector<dungeon_feature_type, 5> replaced;
```
[9.4484277]
[9.4484392]
```
    dungeon_feature_type replaced[5];
```
Insertion in crawl-ref/source/abyss.cc at line 197 [9.4482606]
[9.4485206]
[119.542]
```
        // Place some number of rooms.
```

Replacement in crawl-ref/source/abyss.cc at line 200 [9.4482606]

B:BD[9.4485246] → [37.5272:5345]

        for (int rooms_done = 0; rooms_done < rooms_to_do; ++rooms_done)

[9.4485246]

[9.4485266]

        for (int i = 0; i < rooms_to_do; ++i)

Replacement in crawl-ref/source/abyss.cc at line 202 [9.4482606]

B:BD[9.4485276] → [119.662:862]

            const int x1 = 10 + random2(GXM - 20);
            const int y1 = 10 + random2(GYM - 20);
            const int x2 = x1 + 1 + random2(10);
            const int y2 = y1 + 1 + random2(10);

[9.4485276]

[9.4485436]

            // Pick the corners
            coord_def tl( 10 + random2(GXM - 20), 10 + random2(GYM - 20) );
            coord_def br( tl.x + 1 + random2(10), tl.y + 1 + random2(10) );

Replacement in crawl-ref/source/abyss.cc at line 211 [9.4482606]

B:BD[119.921] → [119.921:1031]

B:BD[119.1031] → [116.14355:14373]

∅:D[119.1031] → [9.4485693:4485743]

∅:D[116.14373] → [9.4485693:4485743]

B:BD[9.4485693] → [9.4485693:4485743]

B:BD[9.4485743] → [119.1032:1073]

B:BD[119.1073] → [116.14374:14392]

            for (int i = x1; room_ok && i < x2; i++)
                for (int j = y1; room_ok && j < y2; j++)
                {
                    if (grd[i][j] != DNGN_UNSEEN)
                        room_ok = false;
                }

[119.921]

[9.4486076]

            // Check if the room is taken.
            for ( rectangle_iterator ri(tl, br); ri && room_ok; ++ri )
                if (grd(*ri) != DNGN_UNSEEN)
                    room_ok = false;

Insertion in crawl-ref/source/abyss.cc at line 216 [9.4482606]
[9.4486077]
[116.14393]
```
            // Make the room.
```

Replacement in crawl-ref/source/abyss.cc at line 218 [9.4482606]

B:BD[116.14418] → [116.14418:14432]

∅:D[116.14432] → [119.1101:1245]

B:BD[119.1101] → [119.1101:1245]

B:BD[119.1245] → [116.14433:14447]

            {
                for (int i = x1; i < x2; i++)
                    for (int j = y1; j < y2; j++)
                        grd[i][j] = DNGN_FLOOR;
            }

[116.14418]

[9.4486191]

                for ( rectangle_iterator ri(tl,br); ri; ++ri )
                    grd(*ri) = DNGN_FLOOR;

Replacement in crawl-ref/source/abyss.cc at line 232 [9.4482606]

∅:D[120.5263] → [119.1246:1283]

B:BD[9.4486208] → [119.1246:1283]

B:BD[9.4486266] → [119.1284:1325]

    for (int i = gx1; i <= gx2; i++)
        for (int j = gy1; j <= gy2; j++)

[120.5263]

[9.4486306]

    for ( rectangle_iterator ri(topleft, bottomright); ri; ++ri )
    {
        if (grd(*ri) == DNGN_UNSEEN && x_chance_in_y(thickness + 1, 100))

Replacement in crawl-ref/source/abyss.cc at line 236 [9.4482606]

B:BD[9.4486316] → [121.15595:15674]

            if (grd[i][j] == DNGN_UNSEEN && x_chance_in_y(thickness + 1, 100))

[9.4486316]

[9.4486387]

            grd(*ri) = DNGN_FLOOR;
            if (items_placed < num_items && one_chance_in(200))

Replacement in crawl-ref/source/abyss.cc at line 240 [9.4482606]

B:BD[9.4486401] → [9.4486401:4486442]

B:BD[9.4486442] → [120.5264:5332]

                grd[i][j] = DNGN_FLOOR;
                if (items_placed < num_items && one_chance_in(200))

[9.4486401]

[9.4486504]

                if (!placed_abyssal_rune && abyssal_rune_roll != -1
                    && you.char_direction != GDT_GAME_START
                    && one_chance_in(abyssal_rune_roll))

Replacement in crawl-ref/source/abyss.cc at line 244 [9.4482606]

B:BD[9.4486522] → [118.4992:5064]

B:BD[118.5064] → [117.8241:8305]

∅:D[117.8305] → [118.5064:5125]

B:BD[118.5064] → [118.5064:5125]

∅:D[122.236] → [9.4486566:4486588]

∅:D[118.5125] → [9.4486566:4486588]

B:BD[9.4486566] → [9.4486566:4486588]

B:BD[9.4486588] → [123.18200:18265]

∅:D[123.18265] → [9.4486654:4486733]

B:BD[9.4486654] → [9.4486654:4486733]

B:BD[9.4486733] → [118.5126:5178]

                    if (!placed_abyssal_rune && abyssal_rune_roll != -1
                        && you.char_direction != GDT_GAME_START
                        && one_chance_in(abyssal_rune_roll))
                    {
                        thing_created = items(1, OBJ_MISCELLANY,
                                              MISC_RUNE_OF_ZOT, true, 51, 51);
                        placed_abyssal_rune = true;

[9.4486522]

[64.4673]

                    thing_created = items(1, OBJ_MISCELLANY,
                                          MISC_RUNE_OF_ZOT, true, 51, 51);
                    placed_abyssal_rune = true;

Replacement in crawl-ref/source/abyss.cc at line 248 [9.4482606]

∅:D[64.4692] → [114.28227:28303]

B:BD[114.28227] → [114.28227:28303]

                        mpr("Placing an Abyssal rune.", MSGCH_DIAGNOSTICS);

[64.4692]

[114.28303]

                    mpr("Placing an Abyssal rune.", MSGCH_DIAGNOSTICS);

Replacement in crawl-ref/source/abyss.cc at line 250 [9.4482606]

∅:D[114.28310] → [9.4486733:4486802]

B:BD[9.4486733] → [9.4486733:4486802]

B:BD[9.4486802] → [120.5333:5477]

∅:D[119.1461] → [9.4486937:4486959]

∅:D[120.5477] → [9.4486937:4486959]

∅:D[117.9014] → [9.4486937:4486959]

B:BD[9.4486937] → [9.4486937:4486959]

                    }
                    else
                    {
                        thing_created = items(1, OBJ_RANDOM, OBJ_RANDOM,
                                              true, items_level, 250);
                    }

[114.28310]

[9.4486959]

                }
                else
                {
                    thing_created = items(1, OBJ_RANDOM, OBJ_RANDOM,
                                          true, items_level, 250);
                }

Replacement in crawl-ref/source/abyss.cc at line 257 [9.4482606]

B:BD[9.4486960] → [7.67375:67449]

                    move_item_to_grid( &thing_created, coord_def(i, j) );

[9.4486960]

[9.4487023]

                move_item_to_grid( &thing_created, *ri );

Replacement in crawl-ref/source/abyss.cc at line 259 [9.4482606]

B:BD[9.4487024] → [9.4487024:4487133]

                    if (thing_created != NON_ITEM)
                        items_placed++;
                }

[9.4487024]

[9.4487133]

                if (thing_created != NON_ITEM)
                    items_placed++;

Insertion in crawl-ref/source/abyss.cc at line 263 [9.4482606]
[9.4487157]
[9.4487163]
```
    }
```

Replacement in crawl-ref/source/abyss.cc at line 268 [9.4482606]

∅:D[114.28366] → [119.1462:1499]

B:BD[9.4487164] → [119.1462:1499]

B:BD[9.4487206] → [119.1500:1541]

∅:D[119.1541] → [9.4487246:4487348]

B:BD[9.4487246] → [9.4487246:4487348]

    for (int i = gx1; i <= gx2; i++)
        for (int j = gy1; j <= gy2; j++)
        {
            if (grd[i][j] == DNGN_UNSEEN)
                grd[i][j] = replaced[random2(5)];

[114.28366]

[9.4487348]

    for ( rectangle_iterator ri(topleft, bottomright); ri; ++ri )
    {
        if (grd(*ri) == DNGN_UNSEEN)
            grd(*ri) = replaced[random2(5)];

Replacement in crawl-ref/source/abyss.cc at line 273 [9.4482606]

B:BD[9.4487349] → [119.1542:1596]

B:BD[119.1596] → [114.28367:28399]

            if (one_chance_in(7500)) // place an exit
                exits_wanted++;

[9.4487349]

[114.28399]

        if (one_chance_in(7500)) // place an exit
            exits_wanted++;

Replacement in crawl-ref/source/abyss.cc at line 276 [9.4482606]

B:BD[114.28400] → [37.5346:5391]

∅:D[37.5391] → [114.28444:28518]

B:BD[114.28444] → [114.28444:28518]

∅:D[119.1596] → [9.4487386:4487431]

∅:D[114.28518] → [9.4487386:4487431]

B:BD[9.4487386] → [9.4487386:4487431]

B:BD[9.4487431] → [114.28519:28551]

            // Don't place exit under items.
            if (exits_wanted > 0 && igrd[i][j] == NON_ITEM)
            {
                grd[i][j] = DNGN_EXIT_ABYSS;
                exits_wanted--;

[114.28400]

[64.4693]

        // Don't place exit under items.
        if (exits_wanted > 0 && igrd(*ri) == NON_ITEM)
        {
            grd(*ri) = DNGN_EXIT_ABYSS;
            exits_wanted--;

Replacement in crawl-ref/source/abyss.cc at line 282 [9.4482606]
∅:D[64.4712] → [114.28567:28630]
B:BD[114.28567] → [114.28567:28630]
```
                mpr("Placing Abyss exit.", MSGCH_DIAGNOSTICS);
```
[64.4712]
[114.28630]
```
            mpr("Placing Abyss exit.", MSGCH_DIAGNOSTICS);
```

Replacement in crawl-ref/source/abyss.cc at line 284 [9.4482606]

B:BD[114.28637] → [114.28637:28651]

[114.28637]

[114.28685]

        }
        // Except for the altar on the starting position, don't place
        // any altars.
        if (you.char_direction != GDT_GAME_START)
        {
            if (one_chance_in(10000)) // Place an altar.
                altars_wanted++;

Replacement in crawl-ref/source/abyss.cc at line 293 [9.4482606]

B:BD[114.28686] → [117.9015:9170]

            // Except for the altar on the starting position, don't place
            // any altars.
            if (you.char_direction != GDT_GAME_START)

[114.28686]

[9.4487470]

            // Don't place altars under items.
            if (altars_wanted > 0 && igrd(*ri) == NON_ITEM)

Replacement in crawl-ref/source/abyss.cc at line 296 [9.4482606]

B:BD[9.4487484] → [117.9171:9386]

                if (one_chance_in(10000)) // Place an altar.
                    altars_wanted++;
                // Don't place altars under items.
                if (altars_wanted > 0 && igrd[i][j] == NON_ITEM)

[9.4487484]

[9.4487503]

do

Replacement in crawl-ref/source/abyss.cc at line 298 [9.4482606]

B:BD[9.4487521] → [117.9387:9791]

                    do
                    {
                        grd[i][j] = static_cast<dungeon_feature_type>(
                                        DNGN_ALTAR_ZIN + random2(NUM_GODS-1) );
                    }
                    while (grd[i][j] == DNGN_ALTAR_ZIN
                           || grd[i][j] == DNGN_ALTAR_SHINING_ONE
                           || grd[i][j] == DNGN_ALTAR_ELYVILON);

[9.4487521]

[124.647]

                    grd(*ri) = static_cast<dungeon_feature_type>(
                        DNGN_ALTAR_ZIN + random2(NUM_GODS-1) );
                }
                while (grd(*ri) == DNGN_ALTAR_ZIN
                       || grd(*ri) == DNGN_ALTAR_SHINING_ONE
                       || grd(*ri) == DNGN_ALTAR_ELYVILON);

Replacement in crawl-ref/source/abyss.cc at line 305 [9.4482606]

B:BD[124.648] → [117.9792:9960]

                    // Lugonu has a flat 50% chance of corrupting the altar.
                    if (coinflip())
                        grd[i][j] = DNGN_ALTAR_LUGONU;

[124.648]

[114.28795]

                // Lugonu has a flat 50% chance of corrupting the altar.
                if (coinflip())
                    grd(*ri) = DNGN_ALTAR_LUGONU;

Replacement in crawl-ref/source/abyss.cc at line 309 [9.4482606]
B:BD[114.28796] → [117.9961:9998]
```
                    altars_wanted--;
```
[114.28796]
[64.4713]
```
                altars_wanted--;
```

Replacement in crawl-ref/source/abyss.cc at line 311 [9.4482606]

∅:D[64.4732] → [117.9999:10061]

B:BD[114.28845] → [117.9999:10061]

                    mpr("Placing altar.", MSGCH_DIAGNOSTICS);

[64.4732]

[114.28903]

                mpr("Placing altar.", MSGCH_DIAGNOSTICS);

Deletion in crawl-ref/source/abyss.cc at line 313 [9.4482606]
B:BD[114.28910] → [117.10062:10080]
```
                }
```
Insertion in crawl-ref/source/abyss.cc at line 315 [9.4482606]
[114.28934]
[37.5524]
```
    }
```
Replacement in crawl-ref/source/abyss.cc at line 415 [9.4482606]
∅:D[125.2813] → [126.2855:2886]
B:BD[126.2855] → [126.2855:2886]
```
    coord_def sanct_pos(0, 0);
```
[125.2813]
[127.2963]
```
    coord_def sanct_pos;
```
Deletion in crawl-ref/source/abyss.cc at line 432 [9.4482606]
∅:D[125.2964] → [126.3146:3152]
B:BD[126.3146] → [126.3146:3152]
```
    {
```

Deletion in crawl-ref/source/abyss.cc at line 434 [9.4482606]

B:BD[126.3186] → [126.3186:3543]

B:BD[126.3543] → [51.25887:25893]

∅:D[51.25893] → [126.3550:3551]

B:BD[126.3550] → [126.3550:3551]

        coord_def pos;
        for (pos.x = 0; pos.x < LOS_DIAMETER; pos.x++)
            for (pos.y = 0; pos.y < LOS_DIAMETER; pos.y++)
            {
                if (fprops(pos) == FPROP_SANCTUARY_1
                    || fprops(pos) == FPROP_SANCTUARY_2)
                {
                    fprops(pos) = FPROP_NONE;
                }
            }
    }

Replacement in crawl-ref/source/abyss.cc at line 448 [9.4482606]

B:BD[9.4488581] → [9.4488581:4488621]

B:BD[9.4488627] → [9.4488627:4488681]

B:BD[9.4488681] → [37.5612:5659]

∅:D[37.5659] → [128.16504:16569]

B:BD[9.4488727] → [128.16504:16569]

∅:D[128.16569] → [9.4488861:4488887]

B:BD[9.4488861] → [9.4488861:4488887]

    for (int i = 5; i < (GXM - 5); i++)
        for (int j = 5; j < (GYM - 5); j++)
        {
            // Don't modify terrain by player.
            if (grid_distance(i, j, you.x_pos, you.y_pos) <= 10)
                continue;

[9.4488581]

[9.4488901]

    for (rectangle_iterator ri(5); ri; ++ri )
    {
        // Don't modify terrain by player.
        if (grid_distance(*ri, you.pos()) <= 10)
            continue;

Replacement in crawl-ref/source/abyss.cc at line 454 [9.4482606]
B:BD[9.4488902] → [37.5660:5699]
∅:D[37.5699] → [9.4488940:4488977]
B:BD[9.4488940] → [9.4488940:4488977]
```
            // Nuke terrain otherwise.
            grd[i][j] = DNGN_UNSEEN;
```
[9.4488902]
[9.4488977]
```
        // Nuke terrain otherwise.
        grd(*ri) = DNGN_UNSEEN;
```
Replacement in crawl-ref/source/abyss.cc at line 457 [9.4482606]
B:BD[9.4488978] → [37.5700:5727]
```
            // Nuke items.
```
[9.4488978]
[129.3402]
```
        // Nuke items.
```

Replacement in crawl-ref/source/abyss.cc at line 459 [9.4482606]

B:BD[129.3421] → [129.3421:3539]

            if (igrd[i][j] != NON_ITEM)
                mprf(MSGCH_DIAGNOSTICS, "Nuke item stack at (%d, %d)", i, j);

[129.3421]

[129.3539]

        if (igrd(*ri) != NON_ITEM)
            mprf(MSGCH_DIAGNOSTICS, "Nuke item stack at (%d, %d)", i, j);

Replacement in crawl-ref/source/abyss.cc at line 462 [9.4482606]
∅:D[129.3546] → [42.8139:8176]
∅:D[37.5727] → [42.8139:8176]
B:BD[9.4489004] → [42.8139:8176]
```
            lose_item_stack( i, j );
```
[129.3546]
[128.16570]
```
        lose_item_stack( *ri );
```
Replacement in crawl-ref/source/abyss.cc at line 464 [9.4482606]
B:BD[128.16571] → [128.16571:16614]
B:BD[128.16614] → [75.40430:40489]
∅:D[128.16672] → [9.4489044:4489054]
∅:D[75.40489] → [9.4489044:4489054]
B:BD[9.4489044] → [9.4489044:4489054]
```
            if (mgrd[i][j] != NON_MONSTER)
                _abyss_lose_monster( menv[ mgrd[i][j] ] );
        }
```
[128.16571]
[9.4489060]
```
        if (mgrd(*ri) != NON_MONSTER)
            _abyss_lose_monster( menv[ mgrd(*ri) ] );
    }
```

Replacement in crawl-ref/source/abyss.cc at line 471 [9.4482606]

B:BD[9.4489171] → [7.67518:67587]

        const coord_def newpos = coord_def(45,35) + *ri - you.pos();

[9.4489171]

[9.4489224]

        const coord_def newpos = abyss_center + *ri - you.pos();

Replacement in crawl-ref/source/abyss.cc at line 501 [9.4482606]
B:BD[9.4490045] → [9.4490045:4490095]
```
    for (unsigned int i = 0; i < MAX_CLOUDS; i++)
```
[9.4490044]
[9.4490095]
```
    for (int i = 0; i < MAX_CLOUDS; i++)
```

Replacement in crawl-ref/source/abyss.cc at line 506 [9.4482606]

B:BD[9.4490169] → [9.4490169:4490293]

        if (env.cloud[i].x < 35 || env.cloud[i].x > 55
            || env.cloud[i].y < 25 || env.cloud[i].y > 45)
        {

[9.4490169]

[9.4490293]

        if ( grid_distance(abyss_center, env.cloud[i].pos()) > 10 )

Deletion in crawl-ref/source/abyss.cc at line 508 [9.4482606]
B:BD[9.4490324] → [9.4490324:4490334]
```
        }
```
Replacement in crawl-ref/source/abyss.cc at line 510 [9.4482606]
B:BD[9.4490341] → [130.18342:18366]
```
    you.moveto(45, 35);
```
[9.4490341]
[9.4490381]
```
    you.moveto(abyss_center);
```

Replacement in crawl-ref/source/abyss.cc at line 512 [9.4482606]

B:BD[9.4490382] → [75.40490:40607]

    _generate_area(MAPGEN_BORDER, MAPGEN_BORDER,
                   GXM - MAPGEN_BORDER, GYM - MAPGEN_BORDER, true);

[9.4490382]

[9.4490429]

    _generate_area(coord_def(MAPGEN_BORDER, MAPGEN_BORDER),
                   coord_def(GXM - MAPGEN_BORDER, GYM - MAPGEN_BORDER), true);

Insertion in crawl-ref/source/abyss.cc at line 523 [9.4482606]
[114.31719]
[131.53993]
```
    // Place some number of monsters.
```
Deletion in crawl-ref/source/abyss.cc at line 547 [9.4482606]
B:BD[9.4490688] → [9.4490688:4490725]
```
/**********************************/
```
Deletion in crawl-ref/source/abyss.cc at line 550 [9.4482606]
∅:D[114.31753] → [9.4490727:4490751]
B:BD[9.4490727] → [9.4490727:4490751]
```
    int x, y, i, j, k;
```
Insertion in crawl-ref/source/abyss.cc at line 552 [9.4482606]
[9.4490776]
[37.5959]
```
        coord_def newspot;
        bool found = false;
```
Replacement in crawl-ref/source/abyss.cc at line 555 [9.4482606]
∅:D[37.6017] → [9.4490834:4490868]
B:BD[9.4490834] → [9.4490834:4490868]
```
        for (i = 0; i < 100; i++)
```
[37.6017]
[9.4490868]
```
        for (int i = 0; i < 100 && !found; i++)
```

Replacement in crawl-ref/source/abyss.cc at line 557 [9.4482606]

B:BD[9.4490878] → [9.4490878:4490962]

            x = 16 + random2( GXM - 32 );
            y = 16 + random2( GYM - 32 );

[9.4490878]

[9.4490962]

            newspot.x = 16 + random2( GXM - 32 );
            newspot.y = 16 + random2( GYM - 32 );

Replacement in crawl-ref/source/abyss.cc at line 560 [9.4482606]

B:BD[9.4490963] → [123.18342:18383]

∅:D[123.18383] → [9.4491005:4491157]

B:BD[9.4491005] → [9.4491005:4491157]

            if ((grd[x][y] == DNGN_FLOOR
                    || grd[x][y] == DNGN_SHALLOW_WATER)
                && mgrd[x][y] == NON_MONSTER
                && env.cgrid[x][y] == EMPTY_CLOUD)

[9.4490963]

[9.4491157]

            if ((grd(newspot) == DNGN_FLOOR
                    || grd(newspot) == DNGN_SHALLOW_WATER)
                && mgrd(newspot) == NON_MONSTER
                && env.cgrid(newspot) == EMPTY_CLOUD)

Replacement in crawl-ref/source/abyss.cc at line 565 [9.4482606]
B:BD[9.4491171] → [9.4491171:4491194]
```
                break;
```
[9.4491171]
[9.4491194]
```
                found = true;
```
Replacement in crawl-ref/source/abyss.cc at line 569 [9.4482606]
B:BD[9.4491219] → [9.4491219:4491240]
```
        if (i < 100)
```
[9.4491219]
[9.4491240]
```
        if (found)
```
Replacement in crawl-ref/source/abyss.cc at line 574 [9.4482606]
∅:D[114.31845] → [130.18367:18397]
B:BD[9.4491250] → [130.18367:18397]
```
            you.moveto(x, y);
```
[114.31845]
[75.40670]
```
            you.moveto(newspot);
```
Replacement in crawl-ref/source/abyss.cc at line 594 [9.4482606]
B:BD[9.4491593] → [132.2840:2879]
```
    for (i = 0; i < MAX_MONSTERS; ++i)
```
[9.4491593]
[128.17029]
```
    for (int i = 0; i < MAX_MONSTERS; ++i)
```
Replacement in crawl-ref/source/abyss.cc at line 599 [9.4482606]
B:BD[37.6248] → [132.2880:2916]
```
    for (k = 0; k < MAX_ITEMS; ++k)
```
[37.6248]
[9.4491830]
```
    for (int i = 0; i < MAX_ITEMS; ++i)
```
Replacement in crawl-ref/source/abyss.cc at line 601 [9.4482606]
B:BD[9.4491836] → [9.4491836:4491874]
```
        if (is_valid_item( mitm[k] ))
```
[9.4491836]
[9.4491874]
```
        if (is_valid_item( mitm[i] ))
```
Replacement in crawl-ref/source/abyss.cc at line 603 [9.4482606]
B:BD[9.4491884] → [42.8177:8215]
∅:D[42.8215] → [9.4492303:4492334]
∅:D[114.32007] → [9.4492303:4492334]
B:BD[9.4492303] → [9.4492303:4492334]
```
            item_was_lost( mitm[k] );
            destroy_item( k );
```
[9.4491884]
[9.4492334]
```
            item_was_lost( mitm[i] );
            destroy_item( i );
```
Replacement in crawl-ref/source/abyss.cc at line 608 [9.4482606]
B:BD[9.4492418] → [9.4492418:4492455]
```
    for (i = 0; i < MAX_CLOUDS; i++)
```
[9.4492351]
[9.4492455]
```
    for (int i = 0; i < MAX_CLOUDS; i++)
```

Replacement in crawl-ref/source/abyss.cc at line 611 [9.4482606]

B:BD[9.4492483] → [9.4492483:4492520]

B:BD[9.4492526] → [9.4492526:4492577]

B:BD[9.4492577] → [37.6249:6330]

∅:D[37.6330] → [116.15263:15346]

B:BD[116.15263] → [116.15263:15346]

∅:D[116.15346] → [9.4492726:4492779]

B:BD[9.4492726] → [9.4492726:4492779]

    for (i = 10; i < (GXM - 9); i++)
        for (j = 10; j < (GYM - 9); j++)
        {
            grd[i][j]       = DNGN_UNSEEN;  // So generate_area will pick it up.
            igrd[i][j]      = NON_ITEM;
            mgrd[i][j]      = NON_MONSTER;
            env.cgrid[i][j] = EMPTY_CLOUD;
        }

[9.4492483]

[9.4492785]

    for ( rectangle_iterator ri(10); ri; ++ri )
    {
        grd(*ri)       = DNGN_UNSEEN;  // So generate_area will pick it up.
        igrd(*ri)      = NON_ITEM;
        mgrd(*ri)      = NON_MONSTER;
        env.cgrid(*ri) = EMPTY_CLOUD;
    }

Replacement in crawl-ref/source/abyss.cc at line 621 [9.4482606]
B:BD[9.4492821] → [130.18398:18422]
```
    you.moveto(45, 35);
```
[9.4492821]
[9.4492861]
```
    you.moveto(abyss_center);
```

Replacement in crawl-ref/source/abyss.cc at line 623 [9.4482606]

B:BD[9.4492862] → [75.40749:40866]

    _generate_area(MAPGEN_BORDER, MAPGEN_BORDER,
                   GXM - MAPGEN_BORDER, GYM - MAPGEN_BORDER, true);

[9.4492862]

[64.4841]

    _generate_area(coord_def(MAPGEN_BORDER, MAPGEN_BORDER),
                   coord_def(GXM - MAPGEN_BORDER, GYM - MAPGEN_BORDER), true);

Replacement in crawl-ref/source/abyss.cc at line 628 [9.4482606]
B:BD[9.4492916] → [9.4492916:4492960]
```
    grd[you.x_pos][you.y_pos] = DNGN_FLOOR;
```
[9.4492916]
[116.15347]
```
    grd(you.pos()) = DNGN_FLOOR;
```

Replacement in crawl-ref/source/abyss.cc at line 795 [9.4482606]

B:BD[133.18356] → [133.18356:18393]

B:BD[133.18399] → [133.18399:18697]

    for (int xi = -1; xi <= 1; ++xi)
        for (int yi = -1; yi <= 1; ++yi)
        {
            if (!xi && !yi)
                continue;
            const coord_def n(c.x + xi, c.y + yi);
            if (!in_bounds(n))
                continue;
            if (!grid_is_opaque(grd(n)))
                return (false);
        }

[133.18356]

[116.15918]

    for (adjacent_iterator ai(c); ai; ++ai)
        if ( !grid_is_opaque(grd(c)) )
            return (false);

Replacement in crawl-ref/source/abyss.cc at line 843 [9.4482606]

B:BD[134.3192] → [135.226017:226089]

        env.tile_flv[c.x][c.y].wall = tile_DNGN_start[IDX_WALL_UNDEAD]

[134.3192]

[135.226089]

        env.tile_flv(c).wall = tile_DNGN_start[IDX_WALL_UNDEAD]

Replacement in crawl-ref/source/abyss.cc at line 848 [9.4482606]

B:BD[134.3349] → [135.226147:226221]

        env.tile_flv[c.x][c.y].floor = tile_DNGN_start[IDX_FLOOR_NERVES]

[134.3349]

[135.226221]

        env.tile_flv(c).floor = tile_DNGN_start[IDX_FLOOR_NERVES]

Replacement in crawl-ref/source/abyss.cc at line 862 [9.4482606]

B:BD[133.19978] → [123.18492:18493]

∅:D[123.18493] → [133.19983:20045]

B:BD[133.19983] → [133.19983:20045]

B:BD[133.20051] → [133.20051:20117]


    for (int y = MAPGEN_BORDER; y < GYM - MAPGEN_BORDER; ++y)
        for (int x = MAPGEN_BORDER; x < GXM - MAPGEN_BORDER; ++x)

[133.19978]

[133.20117]

    
    for ( rectangle_iterator ri(MAPGEN_BORDER); ri; ++ri )
    {
        int distance = GXM * GXM + GYM * GYM;
        for (int i = 0, size = corrupt_seeds.size(); i < size; ++i)
        {
            const int dist = (*ri - corrupt_seeds[i]).rdist();
            if (dist < distance)
                distance = dist;
        }
        
        if ((distance < 6 || one_chance_in(1 + distance - 6))
            && _is_grid_corruptible(*ri))

Replacement in crawl-ref/source/abyss.cc at line 876 [9.4482606]

B:BD[133.20127] → [133.20127:20520]

B:BD[133.20520] → [75.42008:42052]

∅:D[75.42052] → [133.20563:20577]

B:BD[133.20563] → [133.20563:20577]

B:BD[133.20577] → [75.42053:42095]

∅:D[75.42095] → [133.20618:20632]

B:BD[133.20618] → [133.20618:20632]

            const coord_def c(x, y);
            int distance = GXM * GXM + GYM * GYM;
            for (int i = 0, size = corrupt_seeds.size(); i < size; ++i)
            {
                const int dist = (c - corrupt_seeds[i]).rdist();
                if (dist < distance)
                    distance = dist;
            }
            if ((distance < 6 || one_chance_in(1 + distance - 6))
                && _is_grid_corruptible(c))
            {
                _corrupt_square(oenv, c);
            }

[133.20127]

[133.20632]

            _corrupt_square(oenv, *ri);

Insertion in crawl-ref/source/abyss.cc at line 878 [9.4482606]
[133.20642]
[133.20648]
```
    }
```

Replacement in crawl-ref/source/abyss.cc at line 938 [9.4482606]

B:BD[133.21509] → [75.42322:42440]

    _generate_area(MAPGEN_BORDER, MAPGEN_BORDER,
                   GXM - MAPGEN_BORDER, GYM - MAPGEN_BORDER, false);

[133.21509]

[136.1405]

    _generate_area(coord_def(MAPGEN_BORDER, MAPGEN_BORDER),
                   coord_def(GXM - MAPGEN_BORDER, GYM - MAPGEN_BORDER), false);

Replacement in crawl-ref/source/abl-show.cc at line 1741 [9.4494389]
∅:D[137.41826] → [138.2911:2981]
B:BD[133.23159] → [138.2911:2981]
```
        if (beam.target_x == you.x_pos && beam.target_y == you.y_pos)
```
[137.41826]
[138.2981]
```
        if (beam.target() == you.pos())
```

Replacement in crawl-ref/source/abl-show.cc at line 2162 [9.4494389]

B:BD[139.2896] → [139.2896:2964]

    if (!player_under_penance() && (!silenced(you.x_pos, you.y_pos)

[139.2896]

[139.2964]

    if (!player_under_penance() && (!silenced(you.pos())

Replacement in crawl-ref/source/abl-show.cc at line 2177 [9.4494389]
∅:D[75.42793] → [9.4543684:4543757]
B:BD[9.4543684] → [9.4543684:4543757]
```
    if (you.religion != GOD_NO_GOD && !silenced( you.x_pos, you.y_pos ))
```
[75.42793]
[140.7038]
```
    if (you.religion != GOD_NO_GOD && !silenced( you.pos() ))
```

More cleanups and fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 930 [9.16817]

Replacement in crawl-ref/source/traps.cc at line 406 [12.5308]

Insertion in crawl-ref/source/stuff.h at line 51 [9.217090]

Insertion in crawl-ref/source/stuff.h at line 75 [9.217090]

Insertion in crawl-ref/source/stuff.h at line 122 [9.217090]

Replacement in crawl-ref/source/stuff.h at line 183 [9.217090]

Insertion in crawl-ref/source/stuff.cc at line 133 [9.224557]

Insertion in crawl-ref/source/stuff.cc at line 183 [9.224557]

Replacement in crawl-ref/source/stuff.cc at line 1234 [9.224557]

Replacement in crawl-ref/source/stuff.cc at line 1236 [9.224557]

Replacement in crawl-ref/source/stuff.cc at line 1242 [9.224557]

Replacement in crawl-ref/source/spl-cast.cc at line 602 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2380 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2609 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2805 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2930 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3245 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3384 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3487 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3607 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3620 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3640 [9.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3730 [9.293070]

Replacement in crawl-ref/source/spells4.cc at line 231 [9.436250]

Replacement in crawl-ref/source/spells4.cc at line 308 [9.436250]

Replacement in crawl-ref/source/spells3.cc at line 1633 [9.531613]

Replacement in crawl-ref/source/spells3.cc at line 1863 [9.531613]

Replacement in crawl-ref/source/spells3.cc at line 1868 [9.531613]

Replacement in crawl-ref/source/spells1.cc at line 1694 [9.616635]

Deletion in crawl-ref/source/spells1.cc at line 1700 [9.616635]

Replacement in crawl-ref/source/spells1.cc at line 1701 [9.616635]

Replacement in crawl-ref/source/religion.cc at line 1986 [9.804403]

Replacement in crawl-ref/source/religion.cc at line 5504 [9.804403]

Replacement in crawl-ref/source/player.cc at line 2644 [9.962854]

Replacement in crawl-ref/source/player.cc at line 5828 [9.962854]

Replacement in crawl-ref/source/mstuff2.cc at line 150 [9.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 152 [9.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 298 [9.1340842]

Replacement in crawl-ref/source/mstuff2.cc at line 2472 [9.1340842]

Replacement in crawl-ref/source/monstuff.cc at line 1382 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 1386 [9.1396662]

Replacement in crawl-ref/source/monspeak.cc at line 225 [9.1558496]

Replacement in crawl-ref/source/monspeak.cc at line 261 [9.1558496]

Replacement in crawl-ref/source/mon-util.cc at line 4389 [9.1699344]

Replacement in crawl-ref/source/misc.cc at line 1154 [9.1933596]

Deletion in crawl-ref/source/misc.cc at line 1156 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 1157 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 1160 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 1181 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 1183 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 1186 [9.1933596]

Replacement in crawl-ref/source/misc.cc at line 1191 [9.1933596]

Replacement in crawl-ref/source/message.cc at line 677 [9.1993826]

Replacement in crawl-ref/source/items.h at line 78 [9.2580284]

Replacement in crawl-ref/source/items.cc at line 588 [9.2584728]

Replacement in crawl-ref/source/items.cc at line 590 [9.2584728]

Replacement in crawl-ref/source/items.cc at line 598 [9.2584728]

Replacement in crawl-ref/source/items.cc at line 1928 [9.2584728]

Replacement in crawl-ref/source/item_use.cc at line 571 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3506 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3612 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3711 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3803 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3812 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4122 [9.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4269 [9.2781507]