fiddlerwoaroof/crawl - Change FG6S2SNKFZWJK7PYHASHXU32ORYBOLGFL5RWQVDJ47MFVS4VMQHQC

Various cleanups, mostly having to do with coord_def().

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

Created by haranp on February 15, 2009

FG6S2SNKFZWJK7PYHASHXU32ORYBOLGFL5RWQVDJ47MFVS4VMQHQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 227 [6.39949]
B:BD[6.44373] → [6.44373:44409]
```
    return is_altar(grd[c.x][c.y]);
```
[6.44373]
[6.44409]
```
    return is_altar(grd(c));
```
Replacement in crawl-ref/source/travel.cc at line 239 [6.39949]
B:BD[6.44649] → [6.44649:44692]
```
    return is_player_altar(grd[c.x][c.y]);
```
[6.44649]
[6.44692]
```
    return is_player_altar(grd(c));
```

Replacement in crawl-ref/source/travel.cc at line 1034 [6.39949]

B:BD[7.396] → [7.396:511]

B:BD[7.511] → [8.242:355]

                if (grid_distance(target.x, target.y,
                                  whereto.x, whereto.y) <= 5
                    && distance(target.x, target.y,
                                whereto.x, whereto.y) <= 34)

[7.396]

[7.627]

                if (grid_distance(target, whereto) <= 5
                    && distance(target, whereto) <= 34)

Replacement in crawl-ref/source/travel.cc at line 3065 [6.39949]
B:BD[6.110792] → [9.3879:3914]
```
    int gridc = grd[pos.x][pos.y];
```
[6.110792]
[10.2559]
```
    int gridc = grd(pos);
```

Replacement in crawl-ref/source/tilesdl.cc at line 409 [11.19415]

B:BD[11.25844] → [11.25844:25942]

                fg = env.tile_bk_fg[gc.x][gc.y];
                bg = env.tile_bk_bg[gc.x][gc.y];

[11.25844]

[2.295]

                fg = env.tile_bk_fg(gc);
                bg = env.tile_bk_bg(gc);

Replacement in crawl-ref/source/tilesdl.cc at line 412 [11.19415]

B:BD[2.327] → [2.327:404]

                    tileidx_unseen(fg, bg, get_envmap_char(gc.x, gc.y), gc);

[2.327]

[11.26015]

                    tileidx_unseen(fg, bg, get_envmap_char(gc), gc);

Replacement in crawl-ref/source/tilesdl.cc at line 421 [11.19415]
B:BD[11.26220] → [12.1136:1184]
```
            if (gc.x == cen.x && gc.y == cen.y)
```
[11.26220]
[11.26262]
```
            if (gc == cen)
```
Replacement in crawl-ref/source/terrain.cc at line 265 [14.26938]
B:BD[13.562] → [13.562:599]
```
    if (grd[d.x][d.y] != ft) return;
```
[13.562]
[15.151]
```
    if (grd(d) != ft)
        return;
```

Replacement in crawl-ref/source/terrain.cc at line 268 [14.26938]

B:BD[15.152] → [15.152:280]

    std::string prop = env.markers.property_at(d, MAT_ANY,
                                               "connected_exclude");

[15.152]

[15.280]

    std::string prop = env.markers.property_at(d, MAT_ANY, "connected_exclude");

Replacement in crawl-ref/source/terrain.cc at line 274 [14.26938]
B:BD[15.438] → [15.438:467]
```
        if (out.size() == 0)
```
[15.438]
[15.467]
```
        if (out.empty())
```

Replacement in crawl-ref/source/terrain.cc at line 293 [14.26938]

B:BD[16.570] → [16.570:636]

    if (grd[d.x][d.y] < ft_min || grd[d.x][d.y] > ft_max) return;

[16.570]

[15.518]

    if (grd(d) < ft_min || grd(d) > ft_max)
        return;

Replacement in crawl-ref/source/terrain.cc at line 296 [14.26938]

B:BD[15.519] → [15.519:647]

    std::string prop = env.markers.property_at(d, MAT_ANY,
                                               "connected_exclude");

[15.519]

[15.647]

    std::string prop = env.markers.property_at(d, MAT_ANY, "connected_exclude");

Replacement in crawl-ref/source/terrain.cc at line 302 [14.26938]
B:BD[15.805] → [15.805:834]
```
        if (out.size() == 0)
```
[15.805]
[15.834]
```
        if (out.empty())
```

Replacement in crawl-ref/source/terrain.cc at line 606 [14.26938]

B:BD[17.1519] → [18.1773:1825]

    dungeon_feature_type orig_feat = grd(dest_pos);

[17.1519]

[18.1825]

    const dungeon_feature_type orig_feat = grd(dest_pos);

Replacement in crawl-ref/source/terrain.cc at line 608 [14.26938]
B:BD[18.1826] → [18.1826:1854]
```
    std::string orig_name =
```
[18.1826]
[18.1854]
```
    const std::string orig_name =
```
Replacement in crawl-ref/source/terrain.cc at line 618 [14.26938]
B:BD[18.2170] → [18.2170:2214]
```
    else if (mgrd(orig_pos) != NON_MONSTER)
```
[18.2170]
[18.2214]
```
    else if (const monsters *m = monster_at(orig_pos))
```

Replacement in crawl-ref/source/terrain.cc at line 620 [14.26938]

B:BD[18.2220] → [18.2220:2348]

        monsters &mon(menv[mgrd(orig_pos)]);
        if (you.can_see(&mon))
            orig_actor = mon.name(DESC_NOCAP_THE);

[18.2220]

[18.2348]

        if (you.can_see(m))
            orig_actor = m->name(DESC_NOCAP_THE);

Replacement in crawl-ref/source/terrain.cc at line 626 [14.26938]
B:BD[18.2414] → [18.2414:2458]
```
    else if (mgrd(dest_pos) != NON_MONSTER)
```
[18.2414]
[18.2458]
```
    else if (const monsters *m = monster_at(dest_pos))
```

Replacement in crawl-ref/source/terrain.cc at line 628 [14.26938]

B:BD[18.2464] → [18.2464:2592]

        monsters &mon(menv[mgrd(dest_pos)]);
        if (you.can_see(&mon))
            dest_actor = mon.name(DESC_NOCAP_THE);

[18.2464]

[18.2592]

        if (you.can_see(m))
            dest_actor = m->name(DESC_NOCAP_THE);

Replacement in crawl-ref/source/stuff.cc at line 1693 [20.224557]
B:BD[19.295] → [19.295:347]
```
    return (grid_distance(x, y, other.x, other.y));
```
[19.295]
[21.1996]
```
    return (grid_distance(*this, other));
```

Replacement in crawl-ref/source/player.cc at line 2950 [20.962854]

B:BD[22.6600] → [22.6600:6749]

            env.tile_bk_fg[ri->x][ri->y] = 0;
            env.tile_bk_bg[ri->x][ri->y]
                = tileidx_feature(DNGN_UNSEEN, ri->x, ri->y);

[22.6600]

[23.5747422]

            env.tile_bk_fg(*ri) = 0;
            env.tile_bk_bg(*ri) = tileidx_feature(DNGN_UNSEEN, ri->x, ri->y);

Replacement in crawl-ref/source/misc.cc at line 309 [20.1933596]

B:BD[5.3043] → [5.3043:3142]

        for (int o = igrd[blood.pos.x][blood.pos.y]; o != NON_ITEM;
             o = mitm[o].link)

[5.3043]

[24.13109]

        for (stack_iterator si(blood.pos); si; ++si)

Replacement in crawl-ref/source/misc.cc at line 311 [20.1933596]

B:BD[24.13119] → [5.3143:3253]

            if (mitm[o].base_type == OBJ_POTIONS
                && mitm[o].sub_type == POT_BLOOD_COAGULATED)

[24.13119]

[5.3253]

            if (si->base_type == OBJ_POTIONS
                && si->sub_type == POT_BLOOD_COAGULATED)

Replacement in crawl-ref/source/misc.cc at line 315 [20.1933596]

B:BD[5.3313] → [5.3313:3369]

                CrawlHashTable &props2 = mitm[o].props;

[5.3313]

[5.3369]

                CrawlHashTable &props2 = si->props;

Replacement in crawl-ref/source/misc.cc at line 317 [20.1933596]

B:BD[5.3414] → [5.3414:3486]

                    init_stack_blood_potions(mitm[o], mitm[o].special);

[5.3414]

[25.5602]

                    init_stack_blood_potions(*si, si->special);

Replacement in crawl-ref/source/misc.cc at line 321 [20.1933596]

B:BD[5.3603] → [5.3603:3662]

                ASSERT(timer2.size() == mitm[o].quantity);

[5.3603]

[24.13321]

                ASSERT(timer2.size() == si->quantity);

Deletion in crawl-ref/source/misc.cc at line 324 [20.1933596]
B:BD[5.3709] → [5.3709:3735]
```
                long val;
```

Replacement in crawl-ref/source/misc.cc at line 326 [20.1933596]

B:BD[5.3796] → [5.3796:3855]

                    val = age_timer[age_timer.size() - 1];

[5.3796]

[5.3855]

                    const long val = age_timer.back();

Replacement in crawl-ref/source/misc.cc at line 331 [20.1933596]

B:BD[5.3994] → [5.3994:4108]

                inc_mitm_item_quantity(o, coag_count);
                ASSERT(timer2.size() == mitm[o].quantity);

[5.3994]

[5.4108]

                inc_mitm_item_quantity(si.link(), coag_count);
                ASSERT(timer2.size() == si->quantity);

Insertion in crawl-ref/source/dungeon.h at line 420 [20.3428186]

[26.14233]

[26.14234]

inline int count_neighbours(const coord_def& p, dungeon_feature_type feat)
{
  return count_neighbours(p.x, p.y, feat);
}

Replacement in crawl-ref/source/dungeon.cc at line 5064 [20.3429798]

B:BD[27.4077] → [3.2630:2686]

                env.tile_bk_bg[ri->x][ri->y] = feature;

[27.4077]

[27.4132]

                env.tile_bk_bg(*ri) = feature;

Replacement in crawl-ref/source/decks.cc at line 2378 [20.3987460]

B:BD[28.20187] → [29.12640:12720]

            && x_chance_in_y(1+count_neighbours(p.x, p.y, DNGN_DEEP_WATER), 8))

[28.20187]

[30.7861]

            && x_chance_in_y(1+count_neighbours(p, DNGN_DEEP_WATER), 8))

Replacement in crawl-ref/source/decks.cc at line 2383 [20.3987460]

B:BD[28.20298] → [28.20298:20456]

            && random2(3) < random2(count_neighbours(p.x,p.y,DNGN_DEEP_WATER)
                               + count_neighbours(p.x,p.y,DNGN_SHALLOW_WATER)))

[28.20298]

[30.8112]

            && random2(3) < random2(count_neighbours(p, DNGN_DEEP_WATER)
                                    + count_neighbours(p, DNGN_SHALLOW_WATER)))

Replacement in crawl-ref/source/acr.cc at line 3071 [20.4397395]

B:BD[31.2812] → [3.2798:2864]

                env.tile_bk_bg[dc.x][dc.y] = TILE_DNGN_OPEN_DOOR;

[31.2812]

[31.2881]

                env.tile_bk_bg(dc) = TILE_DNGN_OPEN_DOOR;

Replacement in crawl-ref/source/acr.cc at line 3237 [20.4397395]

B:BD[31.2934] → [3.2865:2933]

                env.tile_bk_bg[dc.x][dc.y] = TILE_DNGN_CLOSED_DOOR;

[31.2934]

[31.3005]

                env.tile_bk_bg(dc) = TILE_DNGN_CLOSED_DOOR;

Replacement in crawl-ref/source/abyss.cc at line 686 [20.4482606]

B:BD[32.15402] → [32.15402:15472]

        if (!in_bounds(p) || p == you.pos() || mgrd(p) != NON_MONSTER

[32.15402]

[4.4160]

        if (!in_bounds(p) || actor_at(p)