fiddlerwoaroof/crawl - Change JZNN5MYGLJ2N5VOKJU54ROMBUZPQXGGLAKR7GFH3VCCEI65TFAFAC

Move a bit more things to use coord_defs and iterators instead of x,y.

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

Created by haranp on February 4, 2009

JZNN5MYGLJ2N5VOKJU54ROMBUZPQXGGLAKR7GFH3VCCEI65TFAFAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 138 [4.13254]

[3.551]

inline bool is_envmap_detected_item(const coord_def& c) {
    return is_envmap_detected_item(c.x, c.y);
}

Replacement in crawl-ref/source/view.cc at line 770 [4.16817]

B:BD[5.94] → [5.94:461]

B:BD[5.562] → [5.562:589]

B:BD[5.589] → [6.66:113]

∅:D[6.113] → [5.633:668]

B:BD[5.633] → [5.633:668]

    for (int y = Y_BOUND_1; y <= Y_BOUND_2; ++y)
        for (int x = X_BOUND_1; x <= X_BOUND_2; ++x)
        {
            // Don't expose new dug out areas:
            // Note: assumptions are being made here about how
            // terrain can change (eg it used to be solid, and
            // thus monster/item free).
            if (is_terrain_changed(x, y))
                continue;
            if (is_envmap_detected_mons(x, y))
                count++;
        }

[5.94]

[5.668]

    for (rectangle_iterator ri(BOUNDARY_BORDER - 1); ri; ++ri)
    {
        // Don't expose new dug out areas:
        // Note: assumptions are being made here about how
        // terrain can change (eg it used to be solid, and
        // thus monster/item free).
        if (is_terrain_changed(*ri))
            continue;
        
        if (is_envmap_detected_mons(*ri))
            count++;
    }

Replacement in crawl-ref/source/view.cc at line 788 [4.16817]

B:BD[7.7447] → [3.9040:9089]

B:BD[7.7491] → [3.9090:9143]

∅:D[3.9143] → [7.7533:7543]

B:BD[7.7533] → [7.7533:7543]

B:BD[7.7543] → [2.2367:2455]

∅:D[2.2455] → [3.9144:9191]

B:BD[7.7543] → [3.9144:9191]

B:BD[3.9191] → [8.10:73]

∅:D[8.73] → [3.9255:9358]

B:BD[3.9255] → [3.9255:9358]

    for (int y = Y_BOUND_1; y <= Y_BOUND_2; ++y)
        for (int x = X_BOUND_1; x <= X_BOUND_2; ++x)
        {
            // FIXME convert to using p everywhere.
            const coord_def p(x,y);
            // Don't expose new dug out areas:
            // Note: assumptions are being made here about how
            // terrain can change (eg it used to be solid, and
            // thus monster/item free).

[7.7447]

[6.114]

    for (rectangle_iterator ri(BOUNDARY_BORDER - 1); ri; ++ri)
    {
        const coord_def p = *ri;
        // Don't expose new dug out areas:
        // Note: assumptions are being made here about how
        // terrain can change (eg it used to be solid, and
        // thus monster/item free).

Replacement in crawl-ref/source/view.cc at line 796 [4.16817]

B:BD[6.115] → [6.115:223]

            // This reasoning doesn't make sense when it comes to *clearing*
            // the map! (jpeg)

[6.115]

[7.7641]

        // This reasoning doesn't make sense when it comes to *clearing*
        // the map! (jpeg)

Replacement in crawl-ref/source/view.cc at line 799 [4.16817]
B:BD[7.7642] → [9.4126:4177]
∅:D[10.2008] → [3.9471:9494]
∅:D[9.4177] → [3.9471:9494]
B:BD[3.9471] → [3.9471:9494]
∅:D[3.9494] → [7.7905:7931]
B:BD[7.7905] → [7.7905:7931]
```
            unsigned envc = get_envmap_char(x, y);
            if (!envc)
                continue;
```
[7.7642]
[4.39965]
```
        if (get_envmap_char(p) == 0)
            continue;
```

Replacement in crawl-ref/source/view.cc at line 802 [4.16817]

B:BD[4.39966] → [10.2009:2047]

B:BD[10.2047] → [11.144:170]

            if (is_envmap_item(x, y))
                continue;

[4.39966]

[11.170]

        if (is_envmap_item(p))
            continue;

Replacement in crawl-ref/source/view.cc at line 805 [4.16817]

B:BD[11.171] → [11.171:269]

            if (!clear_detected_items && is_envmap_detected_item(x, y))
                continue;

[11.171]

[11.269]

        if (!clear_detected_items && is_envmap_detected_item(p))
            continue;

Replacement in crawl-ref/source/view.cc at line 808 [4.16817]

B:BD[11.270] → [11.270:345]

∅:D[11.345] → [7.8083:8109]

∅:D[10.2047] → [7.8083:8109]

∅:D[3.9652] → [7.8083:8109]

B:BD[7.8083] → [7.8083:8109]

            if (!clear_detected_monsters && is_envmap_detected_mons(x, y))
                continue;

[11.270]

[4.39966]

        if (!clear_detected_monsters && is_envmap_detected_mons(p))
            continue;

Replacement in crawl-ref/source/view.cc at line 811 [4.16817]

B:BD[4.39967] → [2.2456:2520]

∅:D[2.2520] → [3.9884:9935]

∅:D[9.4251] → [3.9884:9935]

B:BD[3.9884] → [3.9884:9935]

B:BD[3.9935] → [9.4252:4303]

            set_envmap_obj(p, is_terrain_known(p)? grd(p) : 0);
            set_envmap_detected_mons(x, y, false);
            set_envmap_detected_item(x, y, false);

[4.39967]

[12.1062]

        set_envmap_obj(p, is_terrain_known(p)? grd(p) : 0);
        set_envmap_detected_mons(p, false);
        set_envmap_detected_item(p, false);

Replacement in crawl-ref/source/view.cc at line 816 [4.16817]

B:BD[12.1079] → [2.2521:2585]

∅:D[2.2585] → [12.1152:1190]

B:BD[12.1152] → [12.1152:1190]

B:BD[12.1190] → [2.2586:2643]

∅:D[2.2643] → [8.74:133]

B:BD[12.1250] → [8.74:133]

∅:D[8.133] → [13.8:60]

B:BD[12.1310] → [13.8:60]

            set_envmap_obj(p, is_terrain_known(p)? grd(p) : 0);
            env.tile_bk_fg[x][y] = 0;
            env.tile_bk_bg[x][y] = is_terrain_known(p) ?
                tile_idx_unseen_terrain(x, y, grd[x][y]) :
                tileidx_feature(DNGN_UNSEEN, x, y);

[12.1079]

[12.1356]

        set_envmap_obj(p, is_terrain_known(p)? grd(p) : 0);
        env.tile_bk_fg(p) = 0;
        env.tile_bk_bg(p) = is_terrain_known(p) ?
            tile_idx_unseen_terrain(p.x, p.y, grd(p)) :
            tileidx_feature(DNGN_UNSEEN, p.x, p.y);

Replacement in crawl-ref/source/view.cc at line 822 [4.16817]
∅:D[12.1363] → [7.8166:8176]
∅:D[9.4303] → [7.8166:8176]
∅:D[3.9935] → [7.8166:8176]
B:BD[7.8166] → [7.8166:8176]
```
        }
```
[12.1363]
[14.233]
```
    }
```

Replacement in crawl-ref/source/tilepick.cc at line 85 [12.96318]

B:BD[12.97608] → [12.97608:97649]

B:BD[12.97649] → [15.1496:1646]

    else if (is_terrain_known(gc.x,gc.y)
                && !is_terrain_seen(gc.x,gc.y)
             || is_envmap_detected_item(gc.x,gc.y)
             || is_envmap_detected_mons(gc.x,gc.y))

[12.97608]

[12.97781]

    else if (is_terrain_known(gc)
                && !is_terrain_seen(gc)
             || is_envmap_detected_item(gc)
             || is_envmap_detected_mons(gc))