fiddlerwoaroof/crawl - Change B7DNCNY7SXL5WAW5B3XZP5KIQSBWOJ3N2YW46WOUQKTRBRRZ7YOQC

Many code cleanups, mostly involving using stack_iterator and

radius_iterator instead of the previous setup.

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

Created by haranp on July 2, 2008

B7DNCNY7SXL5WAW5B3XZP5KIQSBWOJ3N2YW46WOUQKTRBRRZ7YOQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 141 [10.13254]
[9.48]
[9.48]
```
unsigned get_screen_glyph( const coord_def &p );
```

Insertion in crawl-ref/source/view.cc at line 4474 [10.16817]

[11.63656]

[12.383]

unsigned get_screen_glyph( const coord_def &p)
{
    return get_screen_glyph(p.x, p.y);
}

Insertion in crawl-ref/source/stuff.h at line 149 [10.217090]
[13.3068]
[10.222008]
```
int grid_distance( const coord_def& p1, const coord_def& p2 );
```

Insertion in crawl-ref/source/stuff.cc at line 1131 [10.224557]

[11.106958]

int grid_distance( const coord_def& p1, const coord_def& p2 )
{
    return grid_distance(p1.x, p1.y, p2.x, p2.y);
}

Replacement in crawl-ref/source/ouch.cc at line 554 [10.1104358]

B:BD[11.365652] → [14.3435:3497]

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

[11.365652]

[14.3497]

    for (stack_iterator si(coord_def(x,y)); si; ++si)

Replacement in crawl-ref/source/ouch.cc at line 556 [10.1104358]
B:BD[14.3503] → [14.3503:3540]
```
        if (!is_valid_item(mitm[i]))
```
[14.3503]
[14.3540]
```
        if (!is_valid_item(*si))
```

Replacement in crawl-ref/source/ouch.cc at line 559 [10.1104358]

B:BD[14.3563] → [14.3563:3752]

        if (is_valid_item(mitm[i])
            && (mitm[i].base_type == target_class
                || (target_class == OBJ_FOOD
                    && mitm[i].base_type == OBJ_CORPSES)))

[14.3563]

[14.3752]

        if ( si->base_type == target_class
             || (target_class == OBJ_FOOD && si->base_type == OBJ_CORPSES))

Replacement in crawl-ref/source/ouch.cc at line 562 [10.1104358]

B:BD[14.3762] → [4.2552:2594]

∅:D[4.2594] → [14.3786:3858]

B:BD[14.3786] → [14.3786:3858]

            num_dest += mitm[i].quantity;
            item_was_destroyed(mitm[i]);
            destroy_item(i);

[14.3762]

[14.3858]

            num_dest += si->quantity;
            item_was_destroyed(*si);
            destroy_item(si->index());

Replacement in crawl-ref/source/ouch.cc at line 673 [10.1104358]
B:BD[10.1116954] → [10.1116954:1116995]
```
    int protection = player_prot_life();
```
[10.1116954]
[10.1117224]
```
    const int protection = player_prot_life();
```

Replacement in crawl-ref/source/ouch.cc at line 697 [10.1104358]

B:BD[10.1117643] → [10.1117643:1117707]

    unsigned long exp_drained = total_exp * (10 + random2(11));

[10.1117643]

[10.1117707]

    unsigned long exp_drained = (total_exp * (10 + random2(11))) / 100;

Deletion in crawl-ref/source/ouch.cc at line 699 [10.1104358]
B:BD[10.1117708] → [10.1117708:1117733]
```
    exp_drained /= 100;
```
Replacement in crawl-ref/source/misc.cc at line 90 [10.1933596]
B:BD[15.5426] → [15.5426:5475]
```
    int o = get_item_slot( 100 + random2(200) );
```
[15.5426]
[15.5475]
```
    int o = get_item_slot();
```

Insertion in crawl-ref/source/misc.cc at line 413 [10.1933596]

[16.4040]

[17.7056]

    else if (num_changed == 1)
        msg = "One of your ";
    else if (num_changed == 2)
        msg = "Two of your ";
    else if (num_changed >= (potion.quantity * 3) / 4)
        msg = "Most of your ";

Replacement in crawl-ref/source/misc.cc at line 420 [10.1933596]

B:BD[17.7065] → [17.7065:7071]

B:BD[17.7071] → [16.4041:4268]

∅:D[16.4268] → [17.7133:7146]

B:BD[17.7133] → [17.7133:7146]

B:BD[17.7146] → [16.4269:4304]

∅:D[16.4304] → [17.7228:7234]

B:BD[17.7228] → [17.7228:7234]

    {
        if (num_changed == 1)
            msg = "One of your ";
        else if (num_changed == 2)
            msg = "Two of your ";
        else if (num_changed >= (potion.quantity * 3) / 4)
            msg = "Most of your ";
        else
            msg = "Some of your ";
    }

[17.7065]

[16.4305]

        msg = "Some of your ";

Replacement in crawl-ref/source/misc.cc at line 695 [10.1933596]
∅:D[18.4525] → [19.13828:13873]
B:BD[19.13828] → [19.13828:13873]
```
    o = get_item_slot( 100 + random2(200) );
```
[18.4525]
[19.13873]
```
    o = get_item_slot();
```

Replacement in crawl-ref/source/message.cc at line 446 [10.1993826]

B:BD[11.556884] → [20.4842:4894]

            // Aes, find a nicer place to break it.

[11.556884]

[11.556936]

            // Yes, find a nicer place to break it.

Replacement in crawl-ref/source/items.cc at line 590 [10.2584728]
∅:D[21.5449] → [10.2597530:2597609]
B:BD[10.2597530] → [10.2597530:2597609]
```
    int o = igrd[x][y];
    igrd[x][y] = NON_ITEM;
    while (o != NON_ITEM)
```
[21.5449]
[10.2597609]
```
    for ( stack_iterator si(coord_def(x,y)); si; ++si )
```

Replacement in crawl-ref/source/items.cc at line 592 [10.2584728]

B:BD[10.2597615] → [10.2597615:2597687]

        int next = mitm[o].link;
        if (is_valid_item( mitm[o] ))

[10.2597615]

[10.2597687]

        if (is_valid_item( *si )) // FIXME is this check necessary?

Replacement in crawl-ref/source/items.cc at line 594 [10.2584728]

B:BD[10.2597697] → [21.5450:5486]

B:BD[21.5486] → [6.3727:3756]

            item_was_lost(mitm[o]);
            mitm[o].clear();

[10.2597697]

[21.5569]

            item_was_lost(*si);
            si->clear();

Deletion in crawl-ref/source/items.cc at line 597 [10.2584728]
B:BD[21.5579] → [21.5579:5598]
```
        o = next;
```

Replacement in crawl-ref/source/items.cc at line 602 [10.2584728]

B:BD[21.5660] → [21.5660:5739]

    int o = igrd[x][y];
    igrd[x][y] = NON_ITEM;
    while (o != NON_ITEM)

[21.5660]

[21.5739]

    for ( stack_iterator si(coord_def(x,y)); si; ++si )

Replacement in crawl-ref/source/items.cc at line 604 [10.2584728]
B:BD[21.5745] → [21.5745:5778]
∅:D[21.5778] → [22.12919:12920]
B:BD[10.2598120] → [22.12919:12920]
B:BD[22.12920] → [21.5779:5817]
```
        int next = mitm[o].link;
        if (is_valid_item( mitm[o] ))
```
[21.5745]
[21.5817]
```
        if (is_valid_item( *si )) // FIXME is this check necessary?
```

Replacement in crawl-ref/source/items.cc at line 606 [10.2584728]

B:BD[21.5827] → [21.5827:5875]

B:BD[21.5875] → [6.3757:3786]

            item_was_destroyed(mitm[o], cause);
            mitm[o].clear();

[21.5827]

[10.2598203]

            item_was_destroyed( *si, cause);
            si->clear();

Deletion in crawl-ref/source/items.cc at line 609 [10.2584728]
B:BD[10.2598213] → [10.2598213:2598232]
```
        o = next;
```
Replacement in crawl-ref/source/items.cc at line 620 [10.2584728]
B:BD[23.196] → [24.7882:7910]
∅:D[24.7910] → [23.226:232]
B:BD[23.226] → [23.226:232]
B:BD[23.232] → [24.7911:7957]
```
    while (obj != NON_ITEM)
    {
        if (!_invisible_to_player(mitm[obj]))
```
[23.196]
[23.233]
```
    for ( stack_iterator si(obj); si; ++si )
        if (!_invisible_to_player(*si))
```
Replacement in crawl-ref/source/items.cc at line 624 [10.2584728]
∅:D[23.255] → [11.632576:632606]
B:BD[11.632576] → [11.632576:632606]
∅:D[11.632606] → [10.2606026:2606032]
B:BD[10.2606026] → [10.2606026:2606032]
```
        obj = mitm[obj].link;
    }
```
[23.255]
[23.256]
Replacement in crawl-ref/source/items.cc at line 640 [10.2584728]
∅:D[24.8360] → [25.6709:6739]
B:BD[11.633168] → [25.6709:6739]
```
    while ( obj != NON_ITEM )
```
[24.8360]
[25.6739]
```
    for ( stack_iterator si(obj); si; ++si )
```
Replacement in crawl-ref/source/items.cc at line 643 [10.2584728]
∅:D[24.8416] → [25.6746:6816]
B:BD[11.633257] → [25.6746:6816]
∅:D[26.23888] → [11.633326:633369]
B:BD[11.633326] → [11.633326:633369]
B:BD[11.633369] → [24.8417:8418]
∅:D[24.8418] → [11.633369:633399]
∅:D[26.23899] → [11.633369:633399]
B:BD[11.633369] → [11.633369:633399]
```
        if ( !have_nonsquelched || !_invisible_to_player(mitm[obj]) )
            items.push_back( &mitm[obj] );
        obj = mitm[obj].link;
```
[24.8416]
[11.633399]
```
        if ( !have_nonsquelched || !_invisible_to_player(*si) )
            items.push_back( & (*si) );
```

Replacement in crawl-ref/source/items.cc at line 731 [10.2584728]

B:BD[10.2606285] → [25.6817:6886]

    _item_list_on_square( items, igrd[you.x_pos][you.y_pos], true );

[10.2606285]

[10.2606409]

    _item_list_on_square( items, igrd(you.pos()), true );

Replacement in crawl-ref/source/items.cc at line 733 [10.2584728]
B:BD[10.2606410] → [27.2308:2335]
```
    if (items.size() == 0)
```
[10.2606410]
[27.2335]
```
    if (items.empty())
```

Replacement in crawl-ref/source/items.cc at line 951 [10.2584728]

B:BD[7.2708] → [7.2708:2790]

    if (is_rune(item) || item.base_type == OBJ_ORBS
        || is_artefact(item))

[7.2708]

[28.443]

    if (is_rune(item) || item.base_type == OBJ_ORBS || is_artefact(item))

Replacement in crawl-ref/source/items.cc at line 968 [10.2584728]

B:BD[29.346158] → [29.346158:346232]

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

[29.346158]

[29.346232]

    for (stack_iterator si(coord_def(x,y)); si; ++si)

Replacement in crawl-ref/source/items.cc at line 970 [10.2584728]
B:BD[29.346238] → [29.346238:346307]
```
        item_def &item = mitm[link];
        if (origin_known(item))
```
[29.346238]
[29.346307]
```
        if (origin_known( *si ))
```

Replacement in crawl-ref/source/items.cc at line 973 [10.2584728]

∅:D[30.4269] → [29.346329:346456]

B:BD[29.346329] → [29.346329:346456]

        if (!item.orig_monnum)
            item.orig_monnum = static_cast<short>( monnum );
        item.orig_place  = pplace;

[30.4269]

[24.9689]

        if (!si->orig_monnum)
            si->orig_monnum = static_cast<short>( monnum );
        si->orig_place  = pplace;

Replacement in crawl-ref/source/items.cc at line 978 [10.2584728]
B:BD[31.833] → [24.9691:9723]
```
        _milestone_check(item);
```
[31.833]
[30.4320]
```
        _milestone_check(*si);
```
Replacement in crawl-ref/source/items.cc at line 1168 [10.2584728]
B:BD[10.2609660] → [11.634354:634394]
```
    int o = igrd[you.x_pos][you.y_pos];
```
[10.2609660]
[24.9843]
```
    int o = igrd(you.pos());
```

Replacement in crawl-ref/source/items.cc at line 2137 [10.2584728]

B:BD[32.1512] → [32.1512:1627]

B:BD[32.1627] → [25.8778:8817]

∅:D[25.8817] → [32.1665:1689]

B:BD[32.1665] → [32.1665:1689]

    int o, next;
    o = igrd[you.x_pos][you.y_pos];
    while (o != NON_ITEM)
    {
        next = mitm[o].link;
        _autoinscribe_item( mitm[o] );
        o = next;
    }

[32.1512]

[32.1689]

    for ( stack_iterator si(you.pos()); si; ++si )
        _autoinscribe_item( *si );

Replacement in crawl-ref/source/items.cc at line 2269 [10.2584728]
∅:D[33.8854] → [34.268:308]
B:BD[35.7951] → [34.268:308]
```
    int o = igrd[you.x_pos][you.y_pos];
```
[33.8854]
[10.2657806]
```
    int o = igrd(you.pos());
```
Deletion in crawl-ref/source/items.cc at line 2354 [10.2584728]
B:BD[36.2839] → [36.2839:2864]
```
    int item = NON_ITEM;
```

Replacement in crawl-ref/source/items.cc at line 2356 [10.2584728]

B:BD[36.2936] → [36.2936:3069]

        {
            item = igrd[x][y];
            while (item != NON_ITEM)
            {
                item_def &i(mitm[item]);

[36.2936]

[36.3069]

            for ( stack_iterator si(coord_def(x,y)); si; ++si )
                if (is_valid_item( *si)
                    && si->base_type == cls && si->sub_type == sub_type)
                {
                    return (& (*si));
                }

Deletion in crawl-ref/source/items.cc at line 2363 [10.2584728]

B:BD[36.3070] → [36.3070:3265]

                if (is_valid_item(i) && i.base_type == cls
                    && i.sub_type == sub_type)
                    return (&i);
                item = i.link;
            }
        }

Replacement in crawl-ref/source/items.cc at line 2439 [10.2584728]

B:BD[37.147312] → [37.147312:147407]

        for (unsigned i = 0; i < sizeof(max_subtype) / sizeof(*max_subtype);
             ++i)

[37.147312]

[37.147407]

        for (unsigned i = 0; i < ARRAYSZ(max_subtype); ++i)

Replacement in crawl-ref/source/items.cc at line 2441 [10.2584728]
B:BD[37.147417] → [37.147417:147450]
```
            if (!max_subtype[i])
```
[37.147417]
[37.147450]
```
            if (max_subtype[i] == 0)
```
Replacement in crawl-ref/source/item_use.cc at line 1780 [10.2781507]
B:BD[2.2721] → [2.2721:2746]
```
    int item = NON_ITEM;
```
[2.2721]
[2.2746]

Replacement in crawl-ref/source/item_use.cc at line 1783 [10.2781507]

B:BD[2.2818] → [2.2818:3119]

        {
            item = igrd[x][y];
            while (item != NON_ITEM)
            {
                item_def &i(mitm[item]);
                item = i.link;
                if ((i.flags & ISFLAG_THROWN) && items_stack(i, mitem))
                    i.flags |= idflags;
            }
        }

[2.2818]

[2.3119]

            for ( stack_iterator si(coord_def(x,y)); si; ++si )
                if ((si->flags & ISFLAG_THROWN) && items_stack(*si, mitem))
                    si->flags |= idflags;

Replacement in crawl-ref/source/food.cc at line 418 [10.3043806]
∅:D[38.2715] → [10.3048582:3048630]
∅:D[39.6956] → [10.3048582:3048630]
∅:D[11.850831] → [10.3048582:3048630]
B:BD[10.3048582] → [10.3048582:3048630]
```
    if (igrd[you.x_pos][you.y_pos] == NON_ITEM)
```
[39.6956]
[10.3048630]
```
    if (igrd(you.pos()) == NON_ITEM)
```
Replacement in crawl-ref/source/food.cc at line 468 [10.3043806]
∅:D[40.5187] → [41.418:496]
B:BD[41.418] → [41.418:496]
```
    for (int o = igrd[you.x_pos][you.y_pos]; o != NON_ITEM; o = mitm[o].link)
```
[40.5187]
[42.277]
```
    for (stack_iterator si(you.pos()); si; ++si)
```

Replacement in crawl-ref/source/food.cc at line 470 [10.3043806]

B:BD[42.283] → [39.8195:8288]

        if (mitm[o].base_type == OBJ_CORPSES
            && mitm[o].sub_type == CORPSE_BODY)

[42.283]

[43.428]

        if (si->base_type == OBJ_CORPSES && si->sub_type == CORPSE_BODY)

Replacement in crawl-ref/source/food.cc at line 472 [10.3043806]
B:BD[43.438] → [41.591:618]
```
            corpse_id = o;
```
[43.438]
[41.618]
```
            corpse_id = si->index();
```
Replacement in crawl-ref/source/food.cc at line 537 [10.3043806]
∅:D[44.3900] → [39.9778:9856]
B:BD[39.9778] → [39.9778:9856]
```
    for (int o = igrd[you.x_pos][you.y_pos]; o != NON_ITEM; o = mitm[o].link)
```
[44.3900]
[41.1806]
```
    for (stack_iterator si(you.pos()); si; ++si)
```

Replacement in crawl-ref/source/food.cc at line 539 [10.3043806]

B:BD[41.1812] → [39.9857:9960]

        if (mitm[o].base_type != OBJ_CORPSES
            || mitm[o].sub_type != CORPSE_BODY)
        {

[41.1812]

[39.9960]

        if (si->base_type != OBJ_CORPSES || si->sub_type != CORPSE_BODY)

Deletion in crawl-ref/source/food.cc at line 541 [10.3043806]
B:BD[39.9982] → [39.9982:9992]
```
        }
```

Replacement in crawl-ref/source/food.cc at line 542 [10.3043806]

B:BD[45.9083] → [44.3901:3972]

        if (bottle_all && !can_bottle_blood_from_corpse(mitm[o].plus))

[45.9083]

[44.3972]

        if (bottle_all && !can_bottle_blood_from_corpse(si->plus))

Replacement in crawl-ref/source/food.cc at line 546 [10.3043806]
∅:D[44.4034] → [39.10018:10045]
B:BD[39.10018] → [39.10018:10045]
```
            corpse_id = o;
```
[44.4034]
[39.10045]
```
            corpse_id = si->index();
```

Replacement in crawl-ref/source/food.cc at line 551 [10.3043806]

B:BD[39.10088] → [20.10575:10641]

            std::string corpse_name = mitm[o].name(DESC_NOCAP_A);

[39.10088]

[20.10641]

            std::string corpse_name = si->name(DESC_NOCAP_A);

Replacement in crawl-ref/source/food.cc at line 563 [10.3043806]

B:BD[20.11027] → [5.4447:4524]

                corpse_name = get_message_colour_tags(mitm[o], DESC_NOCAP_A,

[20.11027]

[5.4524]

                corpse_name = get_message_colour_tags(*si, DESC_NOCAP_A,

Replacement in crawl-ref/source/food.cc at line 570 [10.3043806]

B:BD[20.11770] → [20.11770:11842]

                      || !can_bottle_blood_from_corpse(mitm[o].plus)) ?

[20.11770]

[20.11842]

                      || !can_bottle_blood_from_corpse(si->plus)) ?

Replacement in crawl-ref/source/food.cc at line 595 [10.3043806]
B:BD[42.1726] → [39.11087:11118]
```
                corpse_id = o;
```
[42.1726]
[45.9088]
```
                corpse_id = si->index();
```

Replacement in crawl-ref/source/food.cc at line 599 [10.3043806]

B:BD[44.4053] → [46.2922:2989]

                    if (can_bottle_blood_from_corpse(mitm[o].plus)

[44.4053]

[46.2989]

                    if (can_bottle_blood_from_corpse(si->plus)

Replacement in crawl-ref/source/food.cc at line 657 [10.3043806]
B:BD[29.428625] → [29.428625:428677]
```
    lua_push_items(ls, igrd[you.x_pos][you.y_pos]);
```
[29.428625]
[29.428677]
```
    lua_push_items(ls, igrd(you.pos()));
```
Replacement in crawl-ref/source/food.cc at line 780 [10.3043806]
B:BD[29.430000] → [47.5932306:5932368]
```
    if (igrd[you.x_pos][you.y_pos] != NON_ITEM && slot == -1)
```
[29.430000]
[29.430048]
```
    if (igrd(you.pos()) != NON_ITEM && slot == -1)
```
Replacement in crawl-ref/source/food.cc at line 1117 [10.3043806]
∅:D[48.176] → [10.3062852:3062930]
∅:D[49.3707] → [10.3062852:3062930]
B:BD[10.3062852] → [10.3062852:3062930]
```
    for (int o = igrd[you.x_pos][you.y_pos]; o != NON_ITEM; o = mitm[o].link)
```
[49.3707]
[10.3062930]
```
    for (stack_iterator si(you.pos()); si; ++si )
```

Replacement in crawl-ref/source/food.cc at line 1119 [10.3043806]

B:BD[10.3062936] → [50.26808:26843]

B:BD[50.26843] → [51.18171:18240]

        item_def& item = mitm[o];
        if (you.species != SP_VAMPIRE && item.base_type != OBJ_FOOD)

[10.3062936]

[51.18240]

        if (you.species != SP_VAMPIRE && si->base_type != OBJ_FOOD)

Replacement in crawl-ref/source/food.cc at line 1124 [10.3043806]

B:BD[49.3757] → [49.3757:3836]

            if (item.base_type != OBJ_CORPSES || item.sub_type != CORPSE_BODY)

[49.3757]

[49.3836]

            if (si->base_type != OBJ_CORPSES || si->sub_type != CORPSE_BODY)

Replacement in crawl-ref/source/food.cc at line 1127 [10.3043806]
B:BD[49.3863] → [49.3863:3907]
```
            if (!mons_has_blood(item.plus))
```
[49.3863]
[49.3907]
```
            if (!mons_has_blood(si->plus))
```

Replacement in crawl-ref/source/food.cc at line 1133 [10.3043806]

B:BD[49.4014] → [52.3846:3919]

        else if (food_is_rotten(item) && !_player_can_eat_rotten_meat())

[49.4014]

[52.3919]

        else if (food_is_rotten(*si) && !_player_can_eat_rotten_meat())

Replacement in crawl-ref/source/food.cc at line 1138 [10.3043806]

B:BD[53.3972] → [53.3972:4039]

        else if (!can_ingest(item.base_type, item.sub_type, true))

[53.3972]

[53.4039]

        else if (!can_ingest(si->base_type, si->sub_type, true))

Replacement in crawl-ref/source/food.cc at line 1142 [10.3043806]
B:BD[53.4095] → [53.4095:4127]
```
                wonteat = item;
```
[53.4095]
[53.4127]
```
                wonteat = *si;
```

Replacement in crawl-ref/source/food.cc at line 1151 [10.3043806]

B:BD[53.4471] → [53.4471:4526]

                if (wonteat.sub_type != item.sub_type)

[53.4471]

[53.4526]

                if (wonteat.sub_type != si->sub_type)

Replacement in crawl-ref/source/food.cc at line 1161 [10.3043806]

B:BD[54.819] → [54.819:933]

               << ' ' << ((item.quantity > 1) ? "one of " : "")
               << item.name(DESC_NOCAP_A) << '?';

[54.819]

[49.4044]

               << ' ' << ((si->quantity > 1) ? "one of " : "")
               << si->name(DESC_NOCAP_A) << '?';

Replacement in crawl-ref/source/food.cc at line 1171 [10.3043806]

B:BD[10.3063434] → [54.1101:1167]

            if (can_ingest(item.base_type, item.sub_type, false))

[10.3063434]

[48.527]

            if (can_ingest(si->base_type, si->sub_type, false))

Replacement in crawl-ref/source/food.cc at line 1173 [10.3043806]
B:BD[48.541] → [54.1168:1203]
```
                eat_floor_item(o);
```
[48.541]
[54.1203]
```
                eat_floor_item(si->index());
```
Replacement in crawl-ref/source/effects.cc at line 1490 [10.3382105]
∅:D[55.1919] → [11.941947:942003]
B:BD[10.3417335] → [11.941947:942003]
```
    if (grid_destroys_items(grd[you.x_pos][you.y_pos]))
```
[55.1919]
[10.3417455]
```
    if (grid_destroys_items(grd(you.pos())))
```

Replacement in crawl-ref/source/effects.cc at line 1495 [10.3382105]

∅:D[56.4415] → [57.2737:2767]

B:BD[58.1320] → [57.2737:2767]

∅:D[57.2767] → [59.30171:30247]

B:BD[59.30171] → [59.30171:30247]

            mprf(MSGCH_SOUND,
                 grid_item_destruction_message(grd[you.x_pos][you.y_pos]));

[56.4415]

[56.4416]

            mprf(MSGCH_SOUND, grid_item_destruction_message(grd(you.pos())));

Replacement in crawl-ref/source/effects.cc at line 1497 [10.3382105]

∅:D[56.4426] → [21.7163:7238]

B:BD[21.7163] → [21.7163:7238]

        item_was_destroyed(mitm[igrd[you.x_pos][you.y_pos]], NON_MONSTER);

[56.4426]

[58.1321]

        item_was_destroyed(mitm[igrd(you.pos())], NON_MONSTER);

Deletion in crawl-ref/source/dungeon.cc at line 750 [10.3429798]
∅:D[3.2692] → [60.331:365]
B:BD[10.3436629] → [60.331:365]
B:BD[60.365] → [61.46658:46704]
```
    for (int i = 0; i < 20; i++)
        env.mons_alloc[i] = MONS_PROGRAM_BUG;
```
Insertion in crawl-ref/source/dungeon.cc at line 751 [10.3429798]
[10.3436630]
[62.11861]
```
    env.mons_alloc.init(MONS_PROGRAM_BUG);
```

Replacement in crawl-ref/source/abyss.cc at line 329 [10.4482606]

B:BD[22.29017] → [22.29017:29239]

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

[22.29017]

[22.29239]

    // is_terrain_known() doesn't work on unmappable levels because
    // mapping flags are not set on such levels.
    for (radius_iterator ri(you.pos(), LOS_RADIUS); ri; ++ri)
        if (grd(*ri) == DNGN_EXIT_ABYSS && get_screen_glyph(*ri) != ' ')
            nearness = std::min(nearness, grid_distance(you.pos(), *ri));

Deletion in crawl-ref/source/abyss.cc at line 335 [10.4482606]

B:BD[22.29240] → [22.29240:29348]

B:BD[22.29348] → [21.7441:7491]

∅:D[21.7491] → [22.29399:29454]

B:BD[22.29399] → [22.29399:29454]

B:BD[22.29454] → [63.14625:14700]

∅:D[63.14700] → [22.29574:29599]

B:BD[22.29574] → [22.29574:29599]

            // HACK: Why doesn't is_terrain_known() work here?
            if (grd[x][y] == DNGN_EXIT_ABYSS
                && get_screen_glyph(x, y) != ' ')
            {
                nearness = MIN(nearness,
                               grid_distance(you.x_pos, you.y_pos, x, y));
            }
        }

Replacement in crawl-ref/source/abyss.cc at line 342 [10.4482606]

B:BD[22.29699] → [22.29699:29922]

B:BD[22.29922] → [36.5179:5312]

∅:D[36.5312] → [21.7492:7539]

B:BD[22.29985] → [21.7492:7539]

∅:D[21.7539] → [22.30033:30253]

B:BD[22.30033] → [22.30033:30253]

B:BD[22.30253] → [63.14701:14723]

∅:D[63.14723] → [22.30253:30438]

B:BD[22.30253] → [22.30253:30438]

B:BD[22.30438] → [63.14724:14746]

∅:D[63.14746] → [22.30438:30491]

B:BD[22.30438] → [22.30438:30491]

∅:D[64.807] → [10.4487784:4487808]

∅:D[65.1982] → [10.4487784:4487808]

∅:D[22.30491] → [10.4487784:4487808]

B:BD[10.4487784] → [10.4487784:4487808]

    for (int x = you.x_pos - LOS_RADIUS; x < you.x_pos + LOS_RADIUS; x++)
        for (int y = you.y_pos - LOS_RADIUS; y < you.y_pos + LOS_RADIUS; y++)
        {
            if (!in_bounds(x, y))
                continue;
            // is_terrain_known() doesn't work on unmappable levels because
            // mapping flags are not set on such levels.
            if (get_screen_glyph(x, y) != ' ')
            {
                int i = igrd[x][y];
                while (i != NON_ITEM)
                {
                    item_def& item(mitm[i]);
                    if (is_rune(item) && item.plus == RUNE_ABYSSAL)
                    {
                        nearness = MIN(nearness,
                                       grid_distance(you.x_pos, you.y_pos,
                                                     x, y));
                    }
                    i = item.link;
                }
            }
        }

[22.29699]

[22.30492]

    // See above comment about is_terrain_known().
    for (radius_iterator ri(you.pos(), LOS_RADIUS); ri; ++ri)
        if (get_screen_glyph(ri->x, ri->y) != ' ')
            for ( stack_iterator si(*ri); si; ++si )
                if (is_rune(*si) && si->plus == RUNE_ABYSSAL)
                    nearness = std::min(nearness, grid_distance(you.pos(),*ri));

Replacement in crawl-ref/source/abyss.cc at line 361 [10.4482606]

B:BD[22.30702] → [22.30702:30769]

// If the player was almost to the exit when it disppeared, Xom is

[22.30702]

[66.1153]

// If the player was almost to the exit when it disappeared, Xom is

Deletion in crawl-ref/source/abyss.cc at line 417 [10.4482606]
B:BD[67.3085] → [67.3085:3132]
```
    radius_iterator ri(you.pos(), LOS_RADIUS);
```
Replacement in crawl-ref/source/abyss.cc at line 418 [10.4482606]
B:BD[67.3133] → [67.3133:3156]
```
    for ( ; ri; ++ri )
```
[67.3133]
[8.2887]
```
    for ( radius_iterator ri(you.pos(), LOS_RADIUS); ri; ++ri )
```
Replacement in crawl-ref/source/abyss.cc at line 453 [10.4482606]
∅:D[68.5611] → [69.16404:16468]
B:BD[10.4488035] → [69.16404:16468]
```
        if (grid_distance(m.x, m.y, you.x_pos, you.y_pos) > 10)
```
[68.5611]
[70.40393]
```
        if (grid_distance(m.pos(), you.pos()) > 10)
```

Many code cleanups, mostly involving using stack_iterator and

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.h at line 141 [10.13254]

Insertion in crawl-ref/source/view.cc at line 4474 [10.16817]

Insertion in crawl-ref/source/stuff.h at line 149 [10.217090]

Insertion in crawl-ref/source/stuff.cc at line 1131 [10.224557]

Replacement in crawl-ref/source/ouch.cc at line 554 [10.1104358]

Replacement in crawl-ref/source/ouch.cc at line 556 [10.1104358]

Replacement in crawl-ref/source/ouch.cc at line 559 [10.1104358]

Replacement in crawl-ref/source/ouch.cc at line 562 [10.1104358]

Replacement in crawl-ref/source/ouch.cc at line 673 [10.1104358]

Replacement in crawl-ref/source/ouch.cc at line 697 [10.1104358]

Deletion in crawl-ref/source/ouch.cc at line 699 [10.1104358]

Replacement in crawl-ref/source/misc.cc at line 90 [10.1933596]

Insertion in crawl-ref/source/misc.cc at line 413 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 420 [10.1933596]

Replacement in crawl-ref/source/misc.cc at line 695 [10.1933596]

Replacement in crawl-ref/source/message.cc at line 446 [10.1993826]

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

Replacement in crawl-ref/source/items.cc at line 592 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 594 [10.2584728]

Deletion in crawl-ref/source/items.cc at line 597 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 602 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 604 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 606 [10.2584728]

Deletion in crawl-ref/source/items.cc at line 609 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 620 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 624 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 640 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 643 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 731 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 733 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 951 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 968 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 970 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 973 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 978 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 1168 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 2137 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 2269 [10.2584728]

Deletion in crawl-ref/source/items.cc at line 2354 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 2356 [10.2584728]

Deletion in crawl-ref/source/items.cc at line 2363 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 2439 [10.2584728]

Replacement in crawl-ref/source/items.cc at line 2441 [10.2584728]

Replacement in crawl-ref/source/item_use.cc at line 1780 [10.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1783 [10.2781507]

Replacement in crawl-ref/source/food.cc at line 418 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 468 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 470 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 472 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 537 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 539 [10.3043806]

Deletion in crawl-ref/source/food.cc at line 541 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 542 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 546 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 551 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 563 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 570 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 595 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 599 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 657 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 780 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 1117 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 1119 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 1124 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 1127 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 1133 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 1138 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 1142 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 1151 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 1161 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 1171 [10.3043806]

Replacement in crawl-ref/source/food.cc at line 1173 [10.3043806]

Replacement in crawl-ref/source/effects.cc at line 1490 [10.3382105]

Replacement in crawl-ref/source/effects.cc at line 1495 [10.3382105]

Replacement in crawl-ref/source/effects.cc at line 1497 [10.3382105]

Deletion in crawl-ref/source/dungeon.cc at line 750 [10.3429798]