fiddlerwoaroof/crawl - Change HB27XKFYVYIEQZGBCEZ6LKPUBMXLIPDAAS636GJ5TULIQ7KND5KQC

Remove a great many cases where mgrd is accessed directly in favour

of monster_at(). The hope is to eventually remove mgrd completely (in favour of scanning through the monster list, or a different datastructure which gets updated automatically when monsters move), and thus fix all the mgrd-out-of-sync bugs in one fell swoop.

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

Created by haranp on February 12, 2009

HB27XKFYVYIEQZGBCEZ6LKPUBMXLIPDAAS636GJ5TULIQ7KND5KQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 1316 [16.5936]
B:BD[14.10738] → [15.8701:8740]
```
    if (mgrd(item.pos) != NON_MONSTER)
```
[14.10738]
[14.10783]
```
    if (monster_at(item.pos))
```
Replacement in crawl-ref/source/tutorial.cc at line 1326 [16.5936]
B:BD[14.10886] → [15.8741:8787]
```
            && mgrd(item.pos) == NON_MONSTER)
```
[14.10886]
[17.365]
```
            && monster_at(item.pos) == NULL)
```
Replacement in crawl-ref/source/tutorial.cc at line 1786 [16.5936]
B:BD[18.4353] → [15.9087:9124]
```
        if (mgrd(gc) != NON_MONSTER)
```
[18.4353]
[19.9382]
```
        if (monster_at(gc))
```
Replacement in crawl-ref/source/tutorial.cc at line 1814 [16.5936]
B:BD[19.9473] → [15.9190:9227]
```
        if (mgrd(gc) != NON_MONSTER)
```
[19.9473]
[19.9512]
```
        if (monster_at(gc))
```
Replacement in crawl-ref/source/tutorial.cc at line 1843 [16.5936]
B:BD[18.4423] → [15.9293:9330]
```
        if (mgrd(gc) != NON_MONSTER)
```
[18.4423]
[19.9701]
```
        if (monster_at(gc))
```

Replacement in crawl-ref/source/tutorial.cc at line 1876 [16.5936]

B:BD[18.4698] → [15.9396:9454]

        if (mgrd(gc) != NON_MONSTER || (you.pos() == gc))

[18.4698]

[19.11114]

        if (monster_at(gc) || (you.pos() == gc))

Replacement in crawl-ref/source/tutorial.cc at line 2646 [16.5936]

B:BD[20.6327] → [20.6327:6498]

        if (mgrd(gc) != NON_MONSTER)
        {
            tiles.add_text_tag(TAG_TUTORIAL, menv[mgrd(gc)].name(DESC_CAP_A),
                               gc);
        }

[20.6327]

[21.1365]

        if (const monsters *m = monster_at(gc))
            tiles.add_text_tag(TAG_TUTORIAL, m->name(DESC_CAP_A), gc);

Replacement in crawl-ref/source/tutorial.cc at line 2661 [16.5936]

B:BD[20.6548] → [20.6548:6595]

B:BD[20.6595] → [22.783:861]

∅:D[22.861] → [20.6674:6720]

B:BD[20.6674] → [20.6674:6720]

        if (mgrd(gc) != NON_MONSTER)
        {
            tiles.add_text_tag(TAG_TUTORIAL, menv[mgrd(gc)].name(DESC_CAP_A),
                               gc);
        }

[20.6548]

[19.17042]

        if (const monsters *m = monster_at(gc))
            tiles.add_text_tag(TAG_TUTORIAL, m->name(DESC_CAP_A), gc);

Replacement in crawl-ref/source/tutorial.cc at line 3809 [16.5936]
B:BD[19.23335] → [19.23335:23365]
```
    int mon_num = mgrd[x][y];
```
[19.23335]
[19.23365]
```
    const coord_def c(x,y);
    const monsters *mon = monster_at(c);
```

Replacement in crawl-ref/source/tutorial.cc at line 3812 [16.5936]

B:BD[19.23366] → [19.23366:23466]

    if (mon_num == NON_MONSTER || grd[x][y] != DNGN_SHALLOW_WATER
        || !see_grid(x, y))
    {

[19.23366]

[18.16465]

    if (mon == NULL || grd(c) != DNGN_SHALLOW_WATER || !see_grid(c))

Deletion in crawl-ref/source/tutorial.cc at line 3814 [16.5936]
∅:D[18.16489] → [19.23488:23537]
B:BD[19.23488] → [19.23488:23537]
```
    }
    const monsters *mon = &menv[mon_num];
```
Replacement in crawl-ref/source/travel.cc at line 847 [24.39949]
B:BD[23.301] → [23.301:339]
```
        if (mgrd(pos) != NON_MONSTER)
```
[23.301]
[23.339]
```
        if (const monsters *mons = monster_at(pos))
```
Deletion in crawl-ref/source/travel.cc at line 849 [24.39949]
B:BD[23.349] → [23.349:404]
```
            const monsters *mons = &menv[ mgrd(pos) ];
```
Deletion in crawl-ref/source/travel.cc at line 853 [24.39949]
B:BD[23.582] → [23.582:583]

Replacement in crawl-ref/source/travel.cc at line 1417 [24.39949]

B:BD[23.901] → [23.901:962]

    const int m_ind = mgrd(c);
    if (m_ind != NON_MONSTER)

[23.901]

[23.962]

    if (const monsters *mons = monster_at(c))

Deletion in crawl-ref/source/travel.cc at line 1419 [24.39949]
B:BD[23.968] → [23.968:1015]
```
        const monsters *mons = &menv[ m_ind ];
```
Replacement in crawl-ref/source/travel.cc at line 4027 [24.39949]
B:BD[25.94946] → [15.13438:13484]
```
    if (mgrd(you.pos() + pos) != NON_MONSTER)
```
[25.94946]
[25.95005]
```
    if (monster_at(you.pos() + pos))
```
Replacement in crawl-ref/source/stuff.cc at line 346 [26.224557]
B:BD[26.226331] → [27.263:297]
```
    if (mgrd(pos) == NON_MONSTER)
```
[26.226331]
[27.297]
```
    monsters *fmenv = monster_at(pos);
    if (fmenv == NULL)
```
Deletion in crawl-ref/source/stuff.cc at line 350 [26.224557]
B:BD[26.226588] → [27.322:362]
∅:D[27.362] → [26.226669:226670]
B:BD[26.226669] → [26.226669:226670]
```
    monsters *fmenv = &menv[mgrd(pos)];
```
Deletion in crawl-ref/source/stuff.cc at line 1658 [26.224557]
∅:D[28.1370] → [25.116020:116021]
B:BD[25.116020] → [25.116020:116021]
B:BD[25.116021] → [28.1371:1399]
```
        int imon = mgrd(g);
```
Deletion in crawl-ref/source/stuff.cc at line 1667 [26.224557]
∅:D[28.1691] → [25.116140:116141]
B:BD[25.116140] → [25.116140:116141]
B:BD[25.116141] → [28.1692:1766]
```
        if (imon == NON_MONSTER || imon == MHITYOU)
            continue;
```

Replacement in crawl-ref/source/stuff.cc at line 1670 [26.224557]

B:BD[28.1866] → [28.1866:1903]

        monsters *mon = &menv[imon];

[28.1866]

[3.257]

        monsters *mon = monster_at(g);
        if (mon == NULL)
            continue;

Replacement in crawl-ref/source/spl-util.cc at line 532 [26.245665]

B:BD[26.254349] → [29.2260:2318]

        if (mgrd(*ai) == NON_MONSTER && *ai != you.pos())

[26.254349]

[29.2318]

        if (monster_at(*ai) == NULL && *ai != you.pos())

Replacement in crawl-ref/source/spells4.cc at line 396 [26.436250]

B:BD[26.459167] → [29.7813:7848]

    const int mnstr = mgrd(where);

[26.459144]

[26.459195]

    monsters *monster = monster_at(where);
    if (monster == NULL)
        return (0);

Replacement in crawl-ref/source/spells4.cc at line 400 [26.436250]

B:BD[26.459196] → [30.193:275]

    if (mnstr == NON_MONSTER)
        return 0;
    monsters& mon = menv[mnstr];

[26.459196]

[26.459418]

    if (mons_holiness(monster) != MH_NATURAL)
        return (0);
    if (check_mons_resist_magic(monster, pow))
        return (0);

Deletion in crawl-ref/source/spells4.cc at line 405 [26.436250]

B:BD[26.459419] → [30.276:402]

    if (mons_holiness(&mon) != MH_NATURAL)
        return 0;
    if (check_mons_resist_magic( &mon, pow ))
        return 0;

Replacement in crawl-ref/source/spells4.cc at line 408 [26.436250]
B:BD[31.17131] → [2.267:310]
```
    const int res = mons_res_cold( &mon );
```
[31.17131]
[2.310]
```
    const int res = mons_res_cold(monster);
```
Replacement in crawl-ref/source/spells4.cc at line 410 [26.436250]
∅:D[2.366] → [32.213:231]
∅:D[30.505] → [32.213:231]
B:BD[32.213] → [32.213:231]
B:BD[32.231] → [2.367:427]
∅:D[2.427] → [32.278:296]
∅:D[30.545] → [32.278:296]
B:BD[32.278] → [32.278:296]
```
        return 0;
    if (mon.has_ench(ENCH_SLEEP_WARY) && !one_chance_in(3))
        return 0;
```
[2.366]
[26.459754]
```
        return (0);
    if (monster->has_ench(ENCH_SLEEP_WARY) && !one_chance_in(3))
        return (0);
```
Replacement in crawl-ref/source/spells4.cc at line 414 [26.436250]
B:BD[26.459755] → [30.546:570]
```
    mon.put_to_sleep();
```
[26.459755]
[26.459846]
```
    monster->put_to_sleep();
```

Replacement in crawl-ref/source/spells4.cc at line 416 [26.436250]

B:BD[26.459847] → [30.571:669]

    if (mons_class_flag( mon.type, M_COLD_BLOOD ) && coinflip())
        mon.add_ench(ENCH_SLOW);

[26.459847]

[26.459964]

    if (mons_class_flag( monster->type, M_COLD_BLOOD ) && coinflip())
        monster->add_ench(ENCH_SLOW);

Replacement in crawl-ref/source/spells4.cc at line 419 [26.436250]
B:BD[26.459965] → [26.459965:459979]
```
    return 1;
```
[26.459965]
[31.17132]
```
    return (1);
```
Replacement in crawl-ref/source/spells4.cc at line 451 [26.436250]
B:BD[26.460263] → [29.7921:7961]
∅:D[29.7961] → [26.460296:460297]
∅:D[33.9143] → [26.460296:460297]
B:BD[26.460296] → [26.460296:460297]
B:BD[26.460297] → [33.9144:9179]
```
    const int which_mons = mgrd(where);
    if (which_mons == NON_MONSTER)
```
[26.460240]
[33.9179]
```
    monsters *monster = monster_at(where);
    if (monster == NULL)
```
Deletion in crawl-ref/source/spells4.cc at line 454 [26.436250]
∅:D[33.9197] → [26.460370:460371]
B:BD[26.460370] → [26.460370:460371]
B:BD[26.460371] → [33.9198:9241]
```
    monsters *monster = &menv[which_mons];
```

Replacement in crawl-ref/source/spells4.cc at line 558 [26.436250]

B:BD[26.463880] → [34.4089:4167]

    dice_def  dam_dice( 0, 5 + pow / 7 );  // Dice added below if applicable.

[26.463880]

[26.463957]

    dice_def dam_dice(0, 5 + pow/7);  // Dice added below if applicable.

Replacement in crawl-ref/source/spells4.cc at line 560 [26.436250]
B:BD[26.463958] → [29.8476:8515]
∅:D[29.8515] → [26.463996:464030]
B:BD[26.463996] → [26.463996:464030]
```
    const int mon_index = mgrd(where);
    if (mon_index == NON_MONSTER)
```
[26.463958]
[26.464030]
```
    monsters *mon = monster_at(where);
    if (mon == NULL)
```
Deletion in crawl-ref/source/spells4.cc at line 563 [26.436250]
B:BD[26.464050] → [26.464050:464104]
```
    struct monsters *const mon = &menv[ mon_index ];
```

Replacement in crawl-ref/source/spells4.cc at line 590 [26.436250]

B:BD[26.465362] → [35.737:793]

        if (!_player_hurt_monster( mon_index, damage ))

[26.465362]

[26.465417]

        if (!_player_hurt_monster(mon->mindex(), damage))

Replacement in crawl-ref/source/spells4.cc at line 771 [26.436250]
B:BD[26.470932] → [29.8589:8622]
```
    const int mon = mgrd(where);
```
[26.470908]
[26.470964]
```
    monsters *monster = monster_at(where);
```
Replacement in crawl-ref/source/spells4.cc at line 786 [26.436250]
∅:D[36.678] → [26.471341:471374]
B:BD[26.471341] → [26.471341:471374]
```
    else if (mon == NON_MONSTER)
```
[36.678]
[26.471374]
```
    else if (monster == NULL)
```

Replacement in crawl-ref/source/spells4.cc at line 788 [26.436250]

B:BD[26.471394] → [26.471394:471464]

    else if (mons_res_elec(&menv[mon]) > 0 || mons_flies(&menv[mon]))

[26.471394]

[26.471464]

    else if (mons_res_elec(monster) > 0 || mons_flies(monster))

Replacement in crawl-ref/source/spells4.cc at line 792 [26.436250]

B:BD[26.471499] → [26.471499:471613]

        damage = 3 + random2( 5 + pow / 10 );
        damage = mons_adjust_flavoured( &menv[mon], beam, damage );

[26.471499]

[26.471613]

        damage = 3 + random2(5 + pow/10);
        damage = mons_adjust_flavoured(monster, beam, damage );

Replacement in crawl-ref/source/spells4.cc at line 798 [26.436250]

B:BD[9.517] → [9.517:620]

                 menv[mon].name(DESC_CAP_THE).c_str());
            _player_hurt_monster(mon, damage);

[9.517]

[26.471843]

                 monster->name(DESC_CAP_THE).c_str());
            _player_hurt_monster(*monster, damage);

Replacement in crawl-ref/source/spells4.cc at line 875 [26.436250]

B:BD[26.474463] → [29.8915:8955]

    int monster_attacked = mgrd(where);

[26.474463]

[29.8955]

    monsters *defender = monster_at(where);
    if (defender == NULL)
        return (0);

Deletion in crawl-ref/source/spells4.cc at line 879 [26.436250]
B:BD[29.8956] → [29.8956:9016]
```
    if (monster_attacked == NON_MONSTER)
        return 0;
```
Deletion in crawl-ref/source/spells4.cc at line 880 [26.436250]
B:BD[29.9037] → [29.9037:9087]
```
    monsters *defender = &menv[monster_attacked];
```
Replacement in crawl-ref/source/spells4.cc at line 931 [26.436250]
B:BD[26.475812] → [35.844:897]
```
    _player_hurt_monster(monster_attacked, specdam);
```
[26.475812]
[26.475864]
```
    _player_hurt_monster(*defender, specdam);
```
Replacement in crawl-ref/source/spells4.cc at line 946 [26.436250]
B:BD[26.476357] → [29.9151:9197]
∅:D[29.9197] → [26.476402:476444]
B:BD[26.476402] → [26.476402:476444]
```
    const int monster_attacked = mgrd(where);
    if (monster_attacked == NON_MONSTER)
```
[26.476333]
[26.476444]
```
    monsters *defender = monster_at(where);
    if (defender == NULL)
```
Deletion in crawl-ref/source/spells4.cc at line 949 [26.436250]
B:BD[26.476462] → [26.476462:476463]
B:BD[26.476463] → [29.9198:9248]
```
    monsters *defender = &menv[monster_attacked];
```

Replacement in crawl-ref/source/spells4.cc at line 986 [26.436250]

B:BD[26.477382] → [29.9394:9434]

∅:D[29.9434] → [26.477421:477482]

B:BD[26.477421] → [26.477421:477482]

B:BD[26.477482] → [29.9435:9485]

    int monster_attacked = mgrd(where);
    if (monster_attacked == NON_MONSTER)
        return 0;
    monsters *defender = &menv[monster_attacked];

[26.477358]

[26.477539]

    monsters *defender = monster_at(where);
    if (defender == NULL)
        return (0);

Replacement in crawl-ref/source/spells4.cc at line 1145 [26.436250]

B:BD[26.483045] → [29.9903:9930]

∅:D[29.9930] → [26.483071:483072]

B:BD[26.483071] → [26.483071:483072]

B:BD[26.483072] → [34.5886:5913]

B:BD[34.5913] → [37.385:430]

∅:D[37.430] → [34.5962:6057]

B:BD[34.5962] → [34.5962:6057]

    int mon = mgrd(where);
    if (mon == NON_MONSTER
        || mons_intel(&menv[mon]) < I_NORMAL
        || mons_holiness(&menv[mon]) != MH_NATURAL
        || mons_res_poison(&menv[mon]) > 0)

[26.483045]

[34.6057]

    monsters *monster = monster_at(where);
    if (monster == NULL
        || mons_intel(monster) < I_NORMAL
        || mons_holiness(monster) != MH_NATURAL
        || mons_res_poison(monster) > 0)

Replacement in crawl-ref/source/spells4.cc at line 1154 [26.436250]

B:BD[26.483314] → [38.148:212]

    menv[mon].add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_YOU));

[26.483314]

[26.483361]

    monster->add_ench(mon_enchant(ENCH_CONFUSION, 0, KC_YOU));

Replacement in crawl-ref/source/spells4.cc at line 1177 [26.436250]
B:BD[26.486290] → [29.9995:10022]
∅:D[29.10022] → [26.486316:486345]
B:BD[26.486316] → [26.486316:486345]
```
    int mon = mgrd(where);
    if (mon == NON_MONSTER)
```
[26.486290]
[26.486345]
```
    monsters *monster = monster_at(where);
    if (monster == NULL)
```
Replacement in crawl-ref/source/spells4.cc at line 1182 [26.436250]
B:BD[39.295] → [39.295:345]
```
    if (mons_class_flag(menv[mon].type, M_GLOWS))
```
[39.295]
[39.345]
```
    if (mons_class_flag(monster->type, M_GLOWS))
```

Replacement in crawl-ref/source/spells4.cc at line 1185 [26.436250]

B:BD[26.487247] → [40.3214:3273]

    mon_enchant bklt = menv[mon].get_ench(ENCH_BACKLIGHT);

[26.487247]

[41.299]

    mon_enchant bklt = monster->get_ench(ENCH_BACKLIGHT);

Replacement in crawl-ref/source/spells4.cc at line 1189 [26.436250]
∅:D[34.6250] → [41.387:427]
B:BD[41.387] → [41.387:427]
```
    if (menv[mon].has_ench(ENCH_INVIS))
```
[34.6250]
[41.427]
```
    if (monster->has_ench(ENCH_INVIS))
```

Replacement in crawl-ref/source/spells4.cc at line 1191 [26.436250]

B:BD[41.433] → [41.433:482]

        if (!menv[mon].has_ench(ENCH_BACKLIGHT))

[41.433]

[41.482]

        if (!monster->has_ench(ENCH_BACKLIGHT))

Replacement in crawl-ref/source/spells4.cc at line 1193 [26.436250]
B:BD[41.492] → [41.492:524]
```
            menv[mon].add_ench(
```
[41.492]
[41.524]
```
            monster->add_ench(
```

Replacement in crawl-ref/source/spells4.cc at line 1195 [26.436250]

B:BD[41.605] → [34.6251:6324]

            simple_monster_message( &menv[mon], " is lined in light." );

[41.605]

[41.679]

            simple_monster_message(monster, " is lined in light.");

Replacement in crawl-ref/source/spells4.cc at line 1200 [26.436250]
∅:D[36.1197] → [41.723:779]
B:BD[41.723] → [41.723:779]
```
    menv[mon].add_ench(mon_enchant(ENCH_BACKLIGHT, 1));
```
[36.1197]
[26.487327]
```
    monster->add_ench(mon_enchant(ENCH_BACKLIGHT, 1));
```
Replacement in crawl-ref/source/spells4.cc at line 1203 [26.436250]
∅:D[40.3319] → [26.487354:487426]
B:BD[26.487354] → [26.487354:487426]
```
        simple_monster_message( &menv[mon], " is outlined in light." );
```
[40.3319]
[40.3320]
```
        simple_monster_message(monster, " is outlined in light.");
```

Replacement in crawl-ref/source/spells4.cc at line 1205 [26.436250]

∅:D[40.3343] → [26.487465:487544]

B:BD[26.487465] → [26.487465:487544]

        simple_monster_message( &menv[mon], " glows brighter for a moment." );

[40.3343]

[36.1198]

        simple_monster_message(monster, " glows brighter for a moment.");

Replacement in crawl-ref/source/spells4.cc at line 1207 [26.436250]
∅:D[36.1207] → [26.487669:487735]
∅:D[40.3394] → [26.487669:487735]
B:BD[26.487669] → [26.487669:487735]
```
        simple_monster_message( &menv[mon], " glows brighter." );
```
[36.1207]
[26.487893]
```
        simple_monster_message(monster, " glows brighter.");
```
Replacement in crawl-ref/source/spells4.cc at line 1509 [26.436250]
B:BD[26.497300] → [42.4332:4365]
∅:D[42.4365] → [26.497350:497364]
∅:D[29.10113] → [26.497350:497364]
B:BD[26.497350] → [26.497350:497364]
```
    const int mon = mgrd(where);
    int ench;
```
[26.497300]
[26.497364]
```
    monsters *monster = monster_at(where);
    if (monster == NULL)
        return (0);
```
Replacement in crawl-ref/source/spells4.cc at line 1513 [26.436250]
B:BD[26.497365] → [26.497365:497412]
B:BD[26.497412] → [25.144015:144064]
∅:D[25.144064] → [26.497465:497483]
B:BD[26.497465] → [26.497465:497483]
```
    if (mon == NON_MONSTER)
        return 0;
    if (mons_holiness(&menv[mon]) != MH_NATURAL)
        return 0;
```
[26.497365]
[26.497483]
```
    if (mons_holiness(monster) != MH_NATURAL)
        return (0);
```

Replacement in crawl-ref/source/spells4.cc at line 1516 [26.436250]

B:BD[26.497484] → [26.497484:497552]

    if (check_mons_resist_magic(&menv[mon], pow))
        return 0;

[26.497484]

[26.497552]

    if (check_mons_resist_magic(monster, pow))
        return (0);

Replacement in crawl-ref/source/spells4.cc at line 1519 [26.436250]

B:BD[26.497553] → [26.497553:497631]

    ench = ((random2(pow) + random2(pow) + random2(pow) + random2(pow)) / 4);

[26.497553]

[40.3472]

    int ench = ((random2(pow) + random2(pow) + random2(pow) + random2(pow))/4);

Replacement in crawl-ref/source/spells4.cc at line 1522 [26.436250]

B:BD[26.497844] → [43.4086:4149]

    menv[mon].add_ench( mon_enchant(ENCH_ROT, ench, KC_YOU) );

[26.497844]

[26.497881]

    monster->add_ench(mon_enchant(ENCH_ROT, ench, KC_YOU));

Replacement in crawl-ref/source/spells4.cc at line 1524 [26.436250]
B:BD[26.497882] → [26.497882:497896]
```
    return 1;
```
[26.497882]
[34.6388]
```
    return (1);
```
Replacement in crawl-ref/source/spells4.cc at line 1529 [26.436250]
B:BD[26.498009] → [42.4430:4463]
∅:D[42.4463] → [26.498059:498073]
∅:D[29.10204] → [26.498059:498073]
B:BD[26.498059] → [26.498059:498073]
```
    const int mon = mgrd(where);
    int ench;
```
[26.498009]
[26.498073]
```
    monsters *monster = monster_at(where);
```
Replacement in crawl-ref/source/spells4.cc at line 1531 [26.436250]
B:BD[26.498074] → [26.498074:498120]
```
    if (mon == NON_MONSTER)
        return 0;
```
[26.498074]
[26.498120]
```
    if (monster == NULL)
        return (0);
```
Replacement in crawl-ref/source/spells4.cc at line 1534 [26.436250]
B:BD[26.498121] → [25.144065:144113]
∅:D[25.144113] → [26.498173:498191]
B:BD[26.498173] → [26.498173:498191]
```
    if (mons_holiness(&menv[mon]) != MH_UNDEAD)
        return 0;
```
[26.498121]
[26.498191]
```
    if (mons_holiness(monster) != MH_UNDEAD)
        return (0);
```

Replacement in crawl-ref/source/spells4.cc at line 1537 [26.436250]

B:BD[26.498192] → [26.498192:498260]

    if (check_mons_resist_magic(&menv[mon], pow))
        return 0;

[26.498192]

[26.498260]

    if (check_mons_resist_magic(monster, pow))
        return (0);

Replacement in crawl-ref/source/spells4.cc at line 1551 [26.436250]
∅:D[44.203] → [26.498793:498821]
B:BD[26.498793] → [26.498793:498821]
```
    switch (menv[mon].type)
```
[44.203]
[26.498821]
```
    switch (monster->type)
```

Replacement in crawl-ref/source/spells4.cc at line 1574 [26.436250]

B:BD[26.499344] → [26.499344:499422]

    ench = ((random2(pow) + random2(pow) + random2(pow) + random2(pow)) / 4);

[26.499344]

[40.3588]

    int ench = ((random2(pow) + random2(pow) + random2(pow) + random2(pow))/4);

Replacement in crawl-ref/source/spells4.cc at line 1577 [26.436250]

B:BD[26.499423] → [43.4150:4213]

    menv[mon].add_ench( mon_enchant(ENCH_ROT, ench, KC_YOU) );

[26.499423]

[26.499634]

    monster->add_ench(mon_enchant(ENCH_ROT, ench, KC_YOU));

Replacement in crawl-ref/source/spells4.cc at line 1579 [26.436250]
B:BD[26.499673] → [26.499673:499687]
```
    return 1;
```
[26.499635]
[31.17646]
```
    return (1);
```
Deletion in crawl-ref/source/spells4.cc at line 1606 [26.436250]
∅:D[35.939] → [26.500456:500468]
B:BD[26.500456] → [26.500456:500468]
```
    return;
```
Replacement in crawl-ref/source/spells4.cc at line 1610 [26.436250]
B:BD[26.500595] → [42.4603:4636]
```
    const int mon = mgrd(where);
```
[26.500595]
[26.500618]
```
    monsters* monster = monster_at(where);
```
Replacement in crawl-ref/source/spells4.cc at line 1612 [26.436250]
B:BD[26.500646] → [31.17658:17685]
```
    if (mon == NON_MONSTER
```
[26.500619]
[31.17685]
```
    if (monster == NULL
```

Replacement in crawl-ref/source/spells4.cc at line 1614 [26.436250]

B:BD[31.17713] → [31.17713:17847]

        || mons_friendly(&menv[mon])
        || mons_char(menv[mon].type) != 'S'
        || check_mons_resist_magic(&menv[mon], pow))

[31.17713]

[31.17847]

        || mons_friendly(monster)
        || mons_char(monster->type) != 'S'
        || check_mons_resist_magic(monster, pow))

Replacement in crawl-ref/source/spells4.cc at line 1621 [26.436250]

B:BD[26.500977] → [26.500977:501016]

B:BD[26.501016] → [45.491:567]

    menv[mon].attitude = ATT_FRIENDLY;
    mprf("%s sways back and forth.", menv[mon].name(DESC_CAP_THE).c_str());

[26.500977]

[26.501132]

    monster->attitude = ATT_FRIENDLY;
    mprf("%s sways back and forth.", monster->name(DESC_CAP_THE).c_str());

Insertion in crawl-ref/source/spells4.cc at line 1990 [26.436250]
[26.511710]
[31.18044]
```
    monsters *monster = monster_at(where);
```
Replacement in crawl-ref/source/spells4.cc at line 1993 [26.436250]
B:BD[31.18067] → [35.1596:1640]
```
    if (invalid_monster_index(mgrd(where)))
```
[31.18067]
[26.512147]
```
    if (monster == NULL)
```
Deletion in crawl-ref/source/spells4.cc at line 2001 [26.436250]
B:BD[26.512219] → [35.1666:1704]
```
    monsters& m = menv[mgrd(where)];
```

Replacement in crawl-ref/source/spells4.cc at line 2002 [26.436250]

B:BD[6.545] → [6.545:611]

    if (mons_is_mimic(m.type))
        m.flags |= MF_KNOWN_MIMIC;

[6.545]

[6.611]

    if (mons_is_mimic(monster->type))
        monster->flags |= MF_KNOWN_MIMIC;

Replacement in crawl-ref/source/spells4.cc at line 2006 [26.436250]
B:BD[26.512264] → [35.1705:1751]
```
    if (check_mons_resist_magic(&m, pow * 2))
```
[26.512264]
[26.512323]
```
    if (check_mons_resist_magic(monster, pow * 2))
```

Replacement in crawl-ref/source/spells4.cc at line 2008 [26.436250]

B:BD[26.512329] → [35.1752:1812]

        simple_monster_message(&m, mons_resist_string(&m));

[26.512329]

[35.1812]

        simple_monster_message(monster, mons_resist_string(monster));

Replacement in crawl-ref/source/spells4.cc at line 2019 [26.436250]

B:BD[46.413] → [35.1886:1924]

B:BD[35.1924] → [6.613:669]

    _player_hurt_monster(m, damage);
    if (mons_is_mimic(m.type))
        mimic_alert(&m);

[46.413]

[6.669]

    if (!_player_hurt_monster(*monster, damage))
        if (mons_is_mimic(monster->type))
            mimic_alert(monster);

Replacement in crawl-ref/source/spells4.cc at line 2080 [26.436250]
B:BD[26.513992] → [15.23081:23136]
```
    if (mgrd(targ.target) == NON_MONSTER || targ.isMe)
```
[26.513992]
[26.514060]
```
    if (monster_at(targ.target) == NULL)
```

Replacement in crawl-ref/source/spells4.cc at line 2153 [26.436250]

B:BD[26.516756] → [10.460:537]

    const int midx = mgrd(targ.target);
    monsters *monster = &menv[midx];

[26.516756]

[26.516820]

    monsters *monster = monster_at(targ.target);

Replacement in crawl-ref/source/spells4.cc at line 2172 [26.436250]
B:BD[34.7333] → [10.538:578]
```
    _player_hurt_monster(midx, damage);
```
[34.7333]
[34.7334]
```
    _player_hurt_monster(*monster, damage);
```

Replacement in crawl-ref/source/spells4.cc at line 2195 [26.436250]

B:BD[5.885] → [5.885:963]

        const int mon = mgrd(where);
        if (!invalid_monster_index(mon))

[5.885]

[26.519431]

        if (monsters* m = monster_at(where))

Replacement in crawl-ref/source/spells4.cc at line 2197 [26.436250]

B:BD[26.519441] → [5.964:1059]

            monsters& m = menv[mon];
            if (mons_is_mimic(m.type) && you.can_see(&m))

[26.519441]

[5.1059]

            if (mons_is_mimic(m->type) && you.can_see(m))

Replacement in crawl-ref/source/spells4.cc at line 2199 [26.436250]

B:BD[5.1073] → [5.1073:1141]

                mprf("%s twitches.", m.name(DESC_CAP_THE).c_str());

[5.1073]

[5.1141]

                mprf("%s twitches.", m->name(DESC_CAP_THE).c_str());

Replacement in crawl-ref/source/spells4.cc at line 2201 [26.436250]

B:BD[5.1216] → [5.1216:1259]

                m.flags |= MF_KNOWN_MIMIC;

[5.1216]

[5.1259]

                m->flags |= MF_KNOWN_MIMIC;

Replacement in crawl-ref/source/spells4.cc at line 2244 [26.436250]

∅:D[5.2280] → [36.2544:2545]

∅:D[15.23601] → [36.2544:2545]

B:BD[47.298] → [36.2544:2545]

B:BD[36.2545] → [5.2281:2408]


        const int mon = mgrd(where);
        if (!invalid_monster_index(mon))
            menv[mon].del_ench(ENCH_HELD, true);

[5.2280]

[26.520804]

        if (monsters *monster = monster_at(where))
            monster->del_ench(ENCH_HELD, true);

Replacement in crawl-ref/source/spells3.cc at line 189 [26.531613]
B:BD[26.536805] → [6.923:967]
```
    if (invalid_monster_index(mgrd(where)))
```
[26.536805]
[6.967]
```
    monsters *m = monster_at(where);
    if (m == NULL)
```
Deletion in crawl-ref/source/spells3.cc at line 199 [26.531613]
B:BD[26.536995] → [6.1144:1181]
∅:D[48.226] → [26.537203:537204]
∅:D[6.1181] → [26.537203:537204]
∅:D[15.23851] → [26.537203:537204]
B:BD[26.537203] → [26.537203:537204]
```
    monsters& m = menv[mgrd(where)];
```

Replacement in crawl-ref/source/spells3.cc at line 202 [26.531613]

B:BD[49.168] → [6.1259:1323]

    const bool success = !stop_attack_prompt(&m, false, false);

[49.168]

[50.187]

    const bool success = !stop_attack_prompt(m, false, false);

Replacement in crawl-ref/source/spells3.cc at line 206 [26.531613]
B:BD[6.1347] → [6.1347:1390]
```
        set_attack_conducts(conducts, &m);
```
[6.1347]
[51.280]
```
        set_attack_conducts(conducts, m);
```

Replacement in crawl-ref/source/spells3.cc at line 208 [26.531613]

B:BD[51.281] → [6.1391:1454]

        mprf("You smite %s!", m.name(DESC_NOCAP_THE).c_str());

[51.281]

[52.167]

        mprf("You smite %s!", m->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/spells3.cc at line 210 [26.531613]

B:BD[52.168] → [6.1455:1567]

        behaviour_event(&m, ME_ANNOY, MHITYOU);
        if (mons_is_mimic(m.type))
            mimic_alert(&m);

[52.168]

[6.1567]

        behaviour_event(m, ME_ANNOY, MHITYOU);
        if (mons_is_mimic(m->type))
            mimic_alert(m);

Replacement in crawl-ref/source/spells3.cc at line 222 [26.531613]

B:BD[6.1804] → [6.1804:1912]

        m.hurt(&you, 7 + (random2(power) * 33 / 191));
        if (m.alive())
            print_wounds(&m);

[6.1804]

[26.537571]

        m->hurt(&you, 7 + (random2(power) * 33 / 191));
        if (m->alive())
            print_wounds(m);

Replacement in crawl-ref/source/spells3.cc at line 234 [26.531613]

B:BD[26.537806] → [15.23852:23907]

    if (mgrd(beam.target) == NON_MONSTER || beam.isMe)

[26.537806]

[26.537993]

    monsters *monster = monster_at(beam.target);
    if (monster == NULL)

Deletion in crawl-ref/source/spells3.cc at line 240 [26.531613]
B:BD[26.538053] → [15.23908:23962]
∅:D[48.921] → [26.538102:538103]
∅:D[15.23962] → [26.538102:538103]
B:BD[26.538102] → [26.538102:538103]
```
        monsters *monster = &menv[mgrd(beam.target)];
```

Replacement in crawl-ref/source/spells3.cc at line 1333 [26.531613]

B:BD[15.24133] → [15.24133:24183]

                || mgrd(you.pos()) != NON_MONSTER

[15.24133]

[15.24183]

                || monster_at(you.pos())

Replacement in crawl-ref/source/spells3.cc at line 1385 [26.531613]
B:BD[15.24503] → [15.24503:24549]
```
               || mgrd(newpos) != NON_MONSTER
```
[15.24503]
[53.1166]
```
               || monster_at(newpos)
```
Replacement in crawl-ref/source/spells3.cc at line 1447 [26.531613]
B:BD[15.24836] → [15.24836:24874]
```
        if (mgrd(*ai) != NON_MONSTER)
```
[15.24836]
[15.24874]
```
        if (monster_at(*ai))
```

Replacement in crawl-ref/source/spells3.cc at line 1706 [26.531613]

B:BD[15.28195] → [15.28195:28264]

        int monster = mgrd(pos);
        if (monster != NON_MONSTER)

[15.28195]

[15.28264]

        if (monsters* mon = monster_at(pos))

Deletion in crawl-ref/source/spells3.cc at line 1708 [26.531613]
B:BD[15.28274] → [15.28274:28318]
B:BD[15.28318] → [54.553:554]
```
            monsters* mon = &menv[monster];
```
Replacement in crawl-ref/source/spells2.cc at line 201 [26.569242]
B:BD[15.31941] → [15.31941:31979]
```
        if (mgrd(*ri) != NON_MONSTER)
```
[15.31941]
[26.572549]
```
        if (monsters *mon = monster_at(*ri))
```
Deletion in crawl-ref/source/spells2.cc at line 203 [26.569242]
B:BD[26.572559] → [15.31980:32028]
```
            monsters *mon = &menv[ mgrd(*ri) ];
```
Replacement in crawl-ref/source/spells2.cc at line 760 [26.569242]
B:BD[26.594349] → [15.32825:32870]
```
    int mgr = mgrd(you.pos() + vmove.delta);
```
[26.594349]
[26.594713]
```
    monsters *monster = monster_at(you.pos() + vmove.delta);
```
Replacement in crawl-ref/source/spells2.cc at line 762 [26.569242]
B:BD[26.594821] → [26.594821:594849]
```
    if (mgr == NON_MONSTER)
```
[26.594714]
[26.594849]
```
    if (monster == NULL)
```
Deletion in crawl-ref/source/spells2.cc at line 768 [26.569242]
B:BD[26.594925] → [55.361:397]
∅:D[55.397] → [26.595003:595004]
∅:D[25.152023] → [26.595003:595004]
B:BD[26.595003] → [26.595003:595004]
```
    monsters *monster = &menv[mgr];
```
Replacement in crawl-ref/source/spells2.cc at line 1350 [26.569242]
B:BD[56.1443] → [15.32999:33038]
```
        if (mgrd(targ) != NON_MONSTER)
```
[56.1443]
[56.1492]
```
        if (const monsters *m = monster_at(targ))
```
Replacement in crawl-ref/source/spells2.cc at line 1352 [26.569242]
B:BD[56.1502] → [15.33039:33098]
```
            if (player_monster_visible(&menv[mgrd(targ)]))
```
[56.1502]
[56.1571]
```
            if (you.can_see(m))
```

Replacement in crawl-ref/source/spells1.cc at line 165 [26.616635]

B:BD[26.618810] → [15.34753:34846]

        if (grid_is_solid(grd(beam.target))
            || mgrd(beam.target) != NON_MONSTER)

[26.618810]

[26.618922]

        if (grid_is_solid(grd(beam.target)) || monster_at(beam.target))

Replacement in crawl-ref/source/spells1.cc at line 534 [26.616635]

B:BD[57.382] → [15.35161:35260]

∅:D[15.35260] → [57.503:578]

B:BD[57.503] → [57.503:578]

        if (grid_is_solid(grd(spelld.target)) ||
            mgrd(spelld.target) != NON_MONSTER ||
            (cloud != EMPTY_CLOUD && env.cloud[cloud].type != CLOUD_FIRE))

[57.382]

[26.624327]

        if (grid_is_solid(grd(spelld.target))
            || monster_at(spelld.target)
            || (cloud != EMPTY_CLOUD && env.cloud[cloud].type != CLOUD_FIRE))

Replacement in crawl-ref/source/religion.cc at line 5357 [26.804403]

B:BD[58.2574] → [59.3876:3918]

            if (mgrd(*ri) == NON_MONSTER)

[58.2574]

[59.3918]

            monsters *monster = monster_at(*ri);
            if (monster == NULL)

Deletion in crawl-ref/source/religion.cc at line 5360 [26.804403]
∅:D[59.3944] → [58.2714:2715]
B:BD[58.2714] → [58.2714:2715]
B:BD[58.2715] → [59.3945:3995]
```
            monsters *monster = &menv[mgrd(*ri)];
```

Replacement in crawl-ref/source/religion.cc at line 5434 [26.804403]

B:BD[15.39551] → [60.5039:5081]

            if (mgrd(*ri) == NON_MONSTER)

[15.39551]

[15.39595]

            monsters *monster = monster_at(*ri);
            if (monster == NULL)

Deletion in crawl-ref/source/religion.cc at line 5438 [26.804403]
B:BD[61.4022] → [15.39622:39672]
B:BD[15.39672] → [59.5289:5290]
```
            monsters *monster = &menv[mgrd(*ri)];
```

Replacement in crawl-ref/source/mtransit.cc at line 273 [63.8445]

B:BD[62.7441] → [62.7441:7517]

                    mgrd[where_to_go.x][where_to_go.y] = monster_index(&m);

[62.7441]

[62.7517]

                    mgrd(where_to_go) = m.mindex();

Replacement in crawl-ref/source/misc.cc at line 2672 [26.1933596]

B:BD[64.3585] → [65.2688:2785]

        const unsigned short targ_monst = env.mgrid(*ri);
        if (targ_monst != NON_MONSTER)

[64.3585]

[66.6745]

        if (monsters* mon = monster_at(*ri))

Deletion in crawl-ref/source/misc.cc at line 2674 [26.1933596]
B:BD[66.6755] → [67.3203:3250]
```
            monsters *mon = &menv[targ_monst];
```
Replacement in crawl-ref/source/misc.cc at line 2683 [26.1933596]
B:BD[67.3633] → [67.3633:3666]
```
                    return mons;
```
[67.3633]
[66.7083]
```
                    break;
```

Replacement in crawl-ref/source/misc.cc at line 2909 [26.1933596]

B:BD[68.358] → [69.2986:3032]

∅:D[69.3032] → [68.400:406]

B:BD[68.400] → [68.400:406]

B:BD[68.406] → [69.3033:3083]

∅:D[69.3083] → [68.452:462]

B:BD[68.452] → [68.452:462]

B:BD[68.462] → [69.3084:3126]

∅:D[69.3126] → [68.500:526]

B:BD[68.500] → [68.500:526]

    for ( int ux = p.x-1; ux <= p.x+1; ++ux )
    {
        for ( int uy = p.y-1; uy <= p.y+1; ++uy )
        {
            if ( ux == p.x && uy == p.y )
                continue;

[68.358]

[68.526]


    for (adjacent_iterator ai(p); ai; ++ai)
        if (grd(*ai) == DNGN_FLOOR && monster_at(*ai) == NULL)
            if (one_chance_in(++num_ok))
                result = *ai;

Deletion in crawl-ref/source/misc.cc at line 2915 [26.1933596]

B:BD[68.527] → [69.3127:3258]

∅:D[69.3258] → [68.666:821]

B:BD[68.666] → [68.666:821]

            if ( in_bounds(ux, uy)
                 && grd[ux][uy] == DNGN_FLOOR
                 && mgrd[ux][uy] == NON_MONSTER )
            {
                ++num_ok;
                if ( one_chance_in(num_ok) )
                    result.set(ux, uy);
            }
        }
    }

Insertion in crawl-ref/source/it_use3.cc at line 271 [26.2870456]
[15.65243]
[26.2878328]
```
    monsters* mons = monster_at(beam.target);
```
Replacement in crawl-ref/source/it_use3.cc at line 283 [26.2870456]
B:BD[70.512] → [15.65291:65338]
```
    else if (mgrd(beam.target) == NON_MONSTER)
```
[70.512]
[26.2878474]
```
    else if (mons == NULL)
```

Replacement in crawl-ref/source/it_use3.cc at line 286 [26.2870456]

B:BD[71.604] → [71.604:774]

        // of invisible monsters. Maybe we shouldn't do practice
        // here to prevent scumming...but that would just encourage
        // finding popcorn monsters.

[71.604]

[26.2878480]

        // of invisible monsters.

Replacement in crawl-ref/source/it_use3.cc at line 312 [26.2870456]

B:BD[71.1620] → [15.65578:65642]

                success = you_attack(mgrd(beam.target), false);

[71.1620]

[26.2879844]

                success = you_attack(mons->mindex(), false);

Replacement in crawl-ref/source/it_use3.cc at line 323 [26.2870456]

B:BD[71.1839] → [15.65643:65703]

            success = you_attack(mgrd(beam.target), false);

[71.1839]

[72.3995]

            success = you_attack(mons->mindex(), false);

Replacement in crawl-ref/source/it_use3.cc at line 328 [26.2870456]

B:BD[72.4036] → [15.65704:65745]

∅:D[15.65745] → [72.4082:4132]

B:BD[72.4082] → [72.4082:4132]

B:BD[72.4132] → [15.65746:65804]

∅:D[15.65804] → [72.4195:4295]

B:BD[72.4195] → [72.4195:4295]

            int mid = mgrd(beam.target);
            if (mid != NON_MONSTER)
            {
                monsters *mon = &menv[mgrd(beam.target)];
                if (mons_is_mimic( mon->type ))
                    mimic_alert(mon);
            }

[72.4036]

[26.2880095]

            // Monster might have died or gone away.
            if (monsters* m = monster_at(beam.target))
                if (mons_is_mimic(m->type))
                    mimic_alert(m);

Replacement in crawl-ref/source/it_use3.cc at line 335 [26.2870456]
B:BD[71.1849] → [15.65805:65851]
```
        you_attack(mgrd(beam.target), false);
```
[71.1849]
[26.2880111]
```
        you_attack(mons->mindex(), false);
```

Replacement in crawl-ref/source/files.cc at line 965 [26.3084589]

B:BD[73.8148] → [73.8148:8186]

        if (mgrd(*ai) == NON_MONSTER)

[73.8148]

[73.8186]

        monsters *fmenv = monster_at(*ai);
        if (fmenv == NULL)

Deletion in crawl-ref/source/files.cc at line 969 [26.3084589]
B:BD[74.9064] → [73.8209:8253]
∅:D[73.8253] → [74.9113:9114]
B:BD[74.9113] → [74.9113:9114]
```
        monsters *fmenv = &menv[mgrd(*ai)];
```
Replacement in crawl-ref/source/effects.cc at line 125 [26.3382105]
B:BD[75.4047] → [76.7276:7309]
∅:D[76.7309] → [75.4073:4102]
∅:D[29.13967] → [75.4073:4102]
B:BD[75.4073] → [75.4073:4102]
```
    const int mon = mgrd(where);
    if (mon == NON_MONSTER)
```
[75.4047]
[77.3081]
```
    monsters *monster = monster_at(where);
    if (monster == NULL)
```
Deletion in crawl-ref/source/effects.cc at line 128 [26.3382105]
∅:D[77.3106] → [75.4125:4162]
B:BD[75.4125] → [75.4125:4162]
```
    monsters *monster = &menv[mon];
```
Replacement in crawl-ref/source/effects.cc at line 265 [26.3382105]
B:BD[75.5210] → [42.10661:10694]
∅:D[42.10694] → [26.3383624:3383653]
∅:D[29.14238] → [26.3383624:3383653]
B:BD[26.3383624] → [26.3383624:3383653]
```
    const int mon = mgrd(where);
    if (mon == NON_MONSTER)
```
[75.5210]
[77.3323]
```
    monsters *monster = monster_at(where);
    if (monster == NULL)
```
Deletion in crawl-ref/source/effects.cc at line 269 [26.3382105]
B:BD[26.3383672] → [78.5654:5690]
∅:D[78.5690] → [26.3383715:3383716]
B:BD[26.3383715] → [26.3383715:3383716]
```
    monsters *monster = &menv[mon];
```

Replacement in crawl-ref/source/effects.cc at line 2228 [26.3382105]

B:BD[26.3427440] → [79.2990:3059]

        direction( targ, DIR_TARGET, TARG_ENEMY, -1, false, false );

[26.3427440]

[26.3427491]

        direction(targ, DIR_TARGET, TARG_ENEMY, -1, false, false);

Deletion in crawl-ref/source/effects.cc at line 2236 [26.3382105]

B:BD[26.3427592] → [15.69498:69630]

        if (!targ.isValid || mgrd(targ.target) == NON_MONSTER
            || !player_monster_visible(&env.mons[mgrd(targ.target)]))

Replacement in crawl-ref/source/effects.cc at line 2237 [26.3382105]

B:BD[26.3427670] → [26.3427670:3427736]

            mpr("Yeah, whatever.");
            return;
        }

[26.3427670]

[26.3427736]

            bool cancel = !targ.isValid;
            if (!cancel)
            {
                const monsters* m = monster_at(targ.target);
                cancel = (m == NULL || !you.can_see(m));
                if (!cancel)
                    mons_targd = m->mindex();
            }

Replacement in crawl-ref/source/effects.cc at line 2246 [26.3382105]

B:BD[26.3427737] → [15.69631:69671]

        mons_targd = mgrd(targ.target);

[26.3427737]

[26.3427782]

            if (cancel)
            {
                mpr("Yeah, whatever.");
                return;
            }
        }

Replacement in crawl-ref/source/effects.cc at line 2800 [26.3382105]
B:BD[80.11213] → [80.11213:11253]
```
            if (mgrd(p) != NON_MONSTER)
```
[80.11213]
[80.11253]
```
            if (monster_at(p))
```
Replacement in crawl-ref/source/effects.cc at line 3560 [26.3382105]
B:BD[81.6617] → [81.6617:6658]
```
            || mgrd(next) != NON_MONSTER
```
[81.6617]
[81.6658]
```
            || monster_at(next)
```
Replacement in crawl-ref/source/directn.cc at line 266 [26.3697945]
∅:D[82.5933603] → [83.1122:1175]
B:BD[83.1122] → [83.1122:1175]
```
    int mid = mgrd(pos);
    if (mid != NON_MONSTER)
```
[82.5933603]
[83.1175]
```
    if (const monsters *mons = monster_at(pos))
```
Deletion in crawl-ref/source/directn.cc at line 268 [26.3697945]
B:BD[83.1181] → [83.1181:1224]
```
        const monsters *mons = &menv[mid];
```
Replacement in crawl-ref/source/directn.cc at line 1058 [26.3697945]
B:BD[26.3701077] → [84.9481:9501]
```
        int i, mid;
```
[26.3701077]
[85.7056]
```
        int i;
```

Replacement in crawl-ref/source/directn.cc at line 1270 [26.3697945]

B:BD[86.9110] → [87.7099:7133]

B:BD[87.7133] → [15.93951:94075]

            if (!moves.isEndpoint
                && mgrd(moves.target) != NON_MONSTER
                && _mon_submerged_in_water(&menv[mgrd(moves.target)]))

[86.9110]

[87.7269]

            if (!moves.isEndpoint)

Replacement in crawl-ref/source/directn.cc at line 1272 [26.3697945]

B:BD[87.7283] → [87.7283:7324]

                moves.isEndpoint = true;

[87.7283]

[87.7324]

                const monsters* m = monster_at(moves.target);
                if (m && _mon_submerged_in_water(m))
                    moves.isEndpoint = true;

Replacement in crawl-ref/source/directn.cc at line 1283 [26.3697945]
B:BD[88.4890] → [15.94116:94154]
∅:D[15.94154] → [89.21675:21676]
B:BD[86.9253] → [89.21675:21676]
B:BD[89.21676] → [88.4891:4927]
∅:D[88.4927] → [86.9291:9328]
B:BD[86.9291] → [86.9291:9328]
```
            mid = mgrd(moves.target);
            if (mid != NON_MONSTER)
                you.prev_targ = mid;
```
[88.4890]
[15.94155]
```
            if (const monsters* m = monster_at(moves.target))
                you.prev_targ = m->mindex();
```

Replacement in crawl-ref/source/directn.cc at line 1342 [26.3697945]

B:BD[90.7572] → [15.94547:94585]

∅:D[15.94585] → [91.907:1005]

B:BD[91.907] → [91.907:1005]

            mid = mgrd(moves.target);
            if (mid == NON_MONSTER) // can put in terrain description here
                break;

[90.7572]

[91.1005]

            {
                monsters* m = monster_at(moves.target);
                if (m == NULL)
                    break;

Replacement in crawl-ref/source/directn.cc at line 1348 [26.3697945]

B:BD[91.1006] → [91.1006:1061]

B:BD[91.1061] → [8.2734:2786]

            {
                monsters &m = menv[mid];
                mon_attitude_type att = m.attitude;

[91.1006]

[8.2786]

                mon_attitude_type att = m->attitude;

Replacement in crawl-ref/source/directn.cc at line 1356 [26.3697945]

B:BD[92.4375] → [92.4375:4411]

B:BD[92.4411] → [93.2669:2721]

∅:D[93.2721] → [92.4458:4588]

B:BD[92.4458] → [92.4458:4588]

B:BD[92.4588] → [93.2722:2837]

∅:D[93.2837] → [92.4588:4965]

B:BD[92.4588] → [92.4588:4965]

                 case ATT_FRIENDLY:
                     m.attitude = ATT_GOOD_NEUTRAL;
                     m.flags &= ~MF_CREATED_FRIENDLY;
                     m.flags |= MF_WAS_NEUTRAL;
                     break;
                 case ATT_GOOD_NEUTRAL:
                     m.attitude = ATT_NEUTRAL;
                     break;
                 case ATT_NEUTRAL:
                     m.attitude = ATT_HOSTILE;
                     m.flags &= ~MF_WAS_NEUTRAL;
                     break;
                 case ATT_HOSTILE:
                     m.attitude = ATT_FRIENDLY;
                     m.flags |= MF_CREATED_FRIENDLY;
                     break;
                 default:
                     break;

[92.4375]

[92.4965]

                case ATT_FRIENDLY:
                    m->attitude = ATT_GOOD_NEUTRAL;
                    m->flags &= ~MF_CREATED_FRIENDLY;
                    m->flags |= MF_WAS_NEUTRAL;
                    break;
                case ATT_GOOD_NEUTRAL:
                    m->attitude = ATT_NEUTRAL;
                    break;
                case ATT_NEUTRAL:
                    m->attitude = ATT_HOSTILE;
                    m->flags &= ~MF_WAS_NEUTRAL;
                    break;
                case ATT_HOSTILE:
                    m->attitude = ATT_FRIENDLY;
                    m->flags |= MF_CREATED_FRIENDLY;
                    break;

Deletion in crawl-ref/source/directn.cc at line 1383 [26.3697945]
∅:D[15.94643] → [94.11049:11072]
B:BD[94.11049] → [94.11049:11072]
B:BD[94.11072] → [15.94644:94682]
∅:D[15.94682] → [94.11116:11191]
B:BD[94.11116] → [94.11116:11191]
```
                break;
            mid = mgrd(moves.target);
            if (mid == NON_MONSTER) // can put in terrain description here
```

Replacement in crawl-ref/source/directn.cc at line 1384 [26.3697945]

B:BD[94.11214] → [94.11214:11215]

B:BD[94.11215] → [95.3446:3501]


            wizard_apply_monster_blessing(&menv[mid]);

[94.11214]

[96.34842]

            if (monsters* m = monster_at(moves.target))
                wizard_apply_monster_blessing(m);

Deletion in crawl-ref/source/directn.cc at line 1389 [26.3697945]
B:BD[96.34905] → [96.34905:34969]
```
            // Maybe we can skip this check...but it can't hurt
```

Replacement in crawl-ref/source/directn.cc at line 1391 [26.3697945]

B:BD[96.35055] → [15.94741:94779]

∅:D[15.94779] → [96.35099:35248]

B:BD[96.35099] → [96.35099:35248]

            mid = mgrd(moves.target);
            if (mid == NON_MONSTER) // can put in terrain description here
                break;
            debug_make_monster_shout(&menv[mid]);

[96.35055]

[91.1180]

            if (monsters* m = monster_at(moves.target))
                debug_make_monster_shout(m);

Replacement in crawl-ref/source/directn.cc at line 1398 [26.3697945]

B:BD[97.10679] → [15.94838:94876]

∅:D[15.94876] → [97.10723:10821]

B:BD[97.10723] → [97.10723:10821]

∅:D[97.10821] → [96.35249:35250]

B:BD[91.1206] → [96.35249:35250]

B:BD[96.35250] → [97.10822:10872]

            mid = mgrd(moves.target);
            if (mid == NON_MONSTER) // can put in terrain description here
                break;
            wizard_give_monster_item(&menv[mid]);

[97.10679]

[97.10872]

            if (monsters* m = monster_at(moves.target))
                wizard_give_monster_item(m);

Deletion in crawl-ref/source/directn.cc at line 1415 [26.3697945]
B:BD[98.10825] → [15.95051:95089]
∅:D[15.95089] → [98.10869:10928]
B:BD[98.10869] → [98.10869:10928]
```
            mid = mgrd(moves.target);
            if (mid == NON_MONSTER)
                break;
```

Replacement in crawl-ref/source/directn.cc at line 1416 [26.3697945]

B:BD[99.2947] → [98.10929:10962]

            debug_pathfind(mid);

[99.2947]

[100.86832]

            if (monsters* m = monster_at(moves.target))
                debug_pathfind(m->mindex());

Replacement in crawl-ref/source/directn.cc at line 1426 [26.3697945]

B:BD[100.87023] → [15.95148:95251]

∅:D[15.95251] → [100.87134:87190]

B:BD[100.87134] → [100.87134:87190]

            mid = mgrd(moves.target);
            if (mid == NON_MONSTER && you.pos() != moves.target)
                break;
            debug_miscast(mid);

[100.87023]

[100.87190]

            if (you.pos() == moves.target)
                debug_miscast(NON_MONSTER);
            if (monsters* m = monster_at(moves.target))
                debug_miscast(m->mindex());

Replacement in crawl-ref/source/directn.cc at line 1435 [26.3697945]

B:BD[4.2755] → [4.2755:2946]

            mid = mgrd(moves.target);
            if (mid == NON_MONSTER) // can put in terrain description here
                break;
            wizard_make_monster_summoned(&menv[mid]);

[4.2755]

[4.2946]

            if (monsters* m = monster_at(moves.target))
                wizard_make_monster_summoned(m);

Deletion in crawl-ref/source/directn.cc at line 1441 [26.3697945]

B:BD[4.3065] → [4.3065:3201]

                break;
            mid = mgrd(moves.target);
            if (mid == NON_MONSTER) // can put in terrain description here

Replacement in crawl-ref/source/directn.cc at line 1442 [26.3697945]

B:BD[4.3224] → [4.3224:3275]


            wizard_polymorph_monster(&menv[mid]);

[4.3224]

[4.3275]

            if (monsters* m = monster_at(moves.target))
                wizard_polymorph_monster(m);

Replacement in crawl-ref/source/directn.cc at line 1607 [26.3697945]

B:BD[101.5744] → [102.8530:8600]

    else if (mgrd(gc) != NON_MONSTER && you.can_see(&menv[mgrd(gc)]))

[101.5744]

[101.5782]

    else if (monster_at(gc) && you.can_see(monster_at(gc)))

Replacement in crawl-ref/source/directn.cc at line 1609 [26.3697945]
B:BD[101.5788] → [101.5788:5835]
```
        const monsters &mons = menv[mgrd(gc)];
```
[101.5788]
[101.5835]
```
        const monsters& mons = *monster_at(gc);
```
Replacement in crawl-ref/source/directn.cc at line 1641 [26.3697945]
B:BD[12.7823] → [12.7823:7852]
```
    if (!see_grid(c.x, c.y))
```
[12.7823]
[12.7852]
```
    if (!see_grid(c))
```
Replacement in crawl-ref/source/directn.cc at line 1644 [26.3697945]
B:BD[12.7869] → [12.7869:7898]
```
    const int mid = mgrd(c);
```
[12.7869]
[12.7898]
```
    const monsters* mons = monster_at(c);
```

Replacement in crawl-ref/source/directn.cc at line 1647 [26.3697945]

B:BD[12.7928] → [12.7928:7994]

    if (mid != NON_MONSTER && player_monster_visible(&menv[mid]))

[12.7928]

[12.7994]

    if (mons && player_monster_visible(mons))

Replacement in crawl-ref/source/directn.cc at line 1650 [26.3697945]
B:BD[12.8037] → [12.8037:8079]
```
        get_monster_desc(menv[mid], inf);
```
[12.8037]
[12.8079]
```
        get_monster_desc(*mons, inf);
```
Replacement in crawl-ref/source/directn.cc at line 1669 [26.3697945]
B:BD[84.9891] → [84.9891:9920]
```
    if (!see_grid(c.x, c.y))
```
[84.9891]
[84.9920]
```
    if (!see_grid(c))
```
Replacement in crawl-ref/source/directn.cc at line 1672 [26.3697945]
B:BD[84.9937] → [84.9937:9966]
```
    const int mid = mgrd(c);
```
[84.9937]
[84.9966]
```
    const monsters* mons = monster_at(c);
```
Replacement in crawl-ref/source/directn.cc at line 1675 [26.3697945]
B:BD[84.9996] → [84.9996:10062]
```
    if (mid != NON_MONSTER && player_monster_visible(&menv[mid]))
```
[84.9996]
[84.10062]
```
    if (mons && player_monster_visible(mons))
```
Replacement in crawl-ref/source/directn.cc at line 1678 [26.3697945]
B:BD[34.16658] → [103.2592:2630]
```
        describe_monsters(menv[mid]);
```
[34.16658]
[84.10142]
```
        describe_monsters(*mons);
```
Replacement in crawl-ref/source/directn.cc at line 1688 [26.3697945]
∅:D[34.16734] → [84.10313:10354]
B:BD[84.10313] → [84.10313:10354]
```
        describe_feature_wide(c.x, c.y);
```
[34.16734]
[84.10354]
```
        describe_feature_wide(c);
```

Replacement in crawl-ref/source/directn.cc at line 1760 [26.3697945]

B:BD[104.3455] → [104.3455:3525]

static bool _mons_is_valid_target(monsters *mon, int mode, int range)

[104.3455]

[104.3525]

static bool _mons_is_valid_target(const monsters *mon, int mode, int range)

Replacement in crawl-ref/source/directn.cc at line 1788 [26.3697945]
B:BD[85.8540] → [85.8540:8575]
```
    if ((int) mlist.size() <= idx)
```
[85.8540]
[85.8575]
```
    if (static_cast<int>(mlist.size()) <= idx)
```
Replacement in crawl-ref/source/directn.cc at line 1794 [26.3697945]
B:BD[85.8684] → [105.47415:47453]
∅:D[105.47453] → [85.8725:8758]
B:BD[85.8725] → [85.8725:8758]
```
    const int targ_mon = mgrd(where);
    if (targ_mon == NON_MONSTER)
```
[85.8684]
[85.8758]
```
    const monsters* mon = monster_at(where);
    if (mon == NULL)
```
Replacement in crawl-ref/source/directn.cc at line 1799 [26.3697945]
B:BD[85.8805] → [85.8805:8859]
```
    for (unsigned int i = 0; i < mlist.size()-1; i++)
```
[85.8805]
[85.8859]
```
    for (unsigned int i = 0; i+1 < mlist.size(); i++)
```
Deletion in crawl-ref/source/directn.cc at line 1814 [26.3697945]
B:BD[85.9219] → [85.9219:9257]
B:BD[85.9257] → [104.4304:4305]
```
    monsters *mon  = &menv[targ_mon];
```
Replacement in crawl-ref/source/directn.cc at line 1854 [26.3697945]
B:BD[106.11847] → [105.47651:47689]
```
    const int targ_mon = mgrd(where);
```
[106.11847]
[106.11848]
```
    const monsters* mon = monster_at(where);
```
Replacement in crawl-ref/source/directn.cc at line 1857 [26.3697945]
B:BD[107.2826] → [105.47690:47741]
```
    if (targ_mon == NON_MONSTER || !in_los(where))
```
[107.2826]
[108.12682]
```
    if (mon == NULL || !in_los(where))
```
Deletion in crawl-ref/source/directn.cc at line 1863 [26.3697945]
B:BD[107.2899] → [106.11850:11851]
B:BD[106.11851] → [87.7891:7928]
```
    monsters *mon = &menv[targ_mon];
```
Replacement in crawl-ref/source/directn.cc at line 1872 [26.3697945]
B:BD[79.6188] → [79.6188:6238]
```
        return (mons_friendly(&menv[targ_mon] ));
```
[79.6188]
[109.7886]
```
        return (mons_friendly(mon));
```
Replacement in crawl-ref/source/directn.cc at line 1875 [26.3697945]
B:BD[107.3438] → [107.3438:3478]
```
    if (mons_friendly(&menv[targ_mon]))
```
[107.3438]
[110.40523]
```
    if (mons_friendly(mon))
```

Replacement in crawl-ref/source/directn.cc at line 1880 [26.3697945]

B:BD[107.3585] → [107.3585:3657]

            || !mons_class_flag( menv[targ_mon].type, M_NO_EXP_GAIN ));

[107.3585]

[24.458801]

            || !mons_class_flag(mon->type, M_NO_EXP_GAIN));

Replacement in crawl-ref/source/directn.cc at line 1898 [26.3697945]

B:BD[79.6667] → [105.48027:48061]

∅:D[105.48061] → [79.6704:6874]

B:BD[79.6704] → [79.6704:6874]

    const int mons = mgrd(where);
    if (mons != NON_MONSTER
        && player_monster_visible( &(menv[mons]) )
        && mons_is_mimic(menv[mons].type)
        && !(menv[mons].flags & MF_KNOWN_MIMIC))

[79.6667]

[79.6874]

    const monsters* m = monster_at(where);
    if (m
        && player_monster_visible(m)
        && mons_is_mimic(m->type)
        && !(m->flags & MF_KNOWN_MIMIC))

Replacement in crawl-ref/source/directn.cc at line 3098 [26.3697945]
B:BD[111.1270] → [105.50380:50416]
```
    if (mgrd(where) != NON_MONSTER)
```
[111.1270]
[26.3718375]
```
    if (const monsters* mon = monster_at(where))
```
Deletion in crawl-ref/source/directn.cc at line 3100 [26.3697945]
B:BD[26.3718381] → [112.5437:5487]
∅:D[112.5487] → [26.3718411:3718412]
∅:D[105.50446] → [26.3718411:3718412]
B:BD[26.3718411] → [26.3718411:3718412]
```
        const monsters* mon = &menv[mgrd(where)];
```

Replacement in crawl-ref/source/describe.h at line 62 [26.3734214]

B:BD[26.3735579] → [95.3572:3784]

∅:D[95.3784] → [113.898:940]

B:BD[26.3735579] → [113.898:940]

// last updated 12 Jun 2008 {jpeg}
/* ***********************************************************************
 * called from: directn
 * *********************************************************************** */
void describe_feature_wide(int x, int y);

[26.3735579]

[12.8558]

void describe_feature_wide(const coord_def& pos);

Replacement in crawl-ref/source/describe.cc at line 2162 [26.3736416]
B:BD[26.3844088] → [12.13840:13881]
```
void describe_feature_wide(int x, int y)
```
[26.3844088]
[12.13881]
```
void describe_feature_wide(const coord_def& pos)
```
Deletion in crawl-ref/source/describe.cc at line 2164 [26.3736416]
B:BD[12.13883] → [12.13883:13914]
∅:D[12.13914] → [114.6934:6935]
B:BD[114.6934] → [114.6934:6935]
```
    const coord_def pos(x, y);
```
Replacement in crawl-ref/source/describe.cc at line 2171 [26.3736416]
B:BD[115.23200] → [19.28127:28164]
```
        tutorial_describe_pos(x, y);
```
[115.23200]
[116.3082]
```
        tutorial_describe_pos(pos.x, pos.y);
```
Deletion in crawl-ref/source/delay.cc at line 86 [26.3963459]
B:BD[117.2778] → [29.14445:14478]
∅:D[29.14478] → [118.3463:3511]
B:BD[118.3463] → [118.3463:3511]
```
    const int mon = mgrd(where);
    if (mon == NON_MONSTER)
        return (0);
```
Replacement in crawl-ref/source/delay.cc at line 87 [26.3963459]
B:BD[118.3512] → [118.3512:3545]
```
    monsters *mons = &menv[mon];
```
[118.3512]
[118.3545]
```
    monsters *mons = monster_at(where);
```
Insertion in crawl-ref/source/delay.cc at line 89 [26.3963459]
[118.3546]
[34.23317]
```
    if (mons == NULL)
        return (0);
```

Replacement in crawl-ref/source/delay.cc at line 679 [26.3963459]

B:BD[73.9636] → [73.9636:9676]

        if ( mgrd(*ri) == NON_MONSTER )

[73.9636]

[73.9676]

        monsters* mons = monster_at(*ri);
        if (mons == NULL)

Replacement in crawl-ref/source/delay.cc at line 686 [26.3963459]
B:BD[73.9772] → [73.9772:9828]
```
        if (!_recite_mons_useless( &menv[mgrd(*ri)] ) )
```
[73.9772]
[119.5302]
```
        if (!_recite_mons_useless(mons))
```
Replacement in crawl-ref/source/delay.cc at line 1143 [26.3963459]
B:BD[120.9476] → [105.51469:51503]
∅:D[105.51503] → [121.6784:6820]
B:BD[121.6784] → [121.6784:6820]
```
            int mon = mgrd(pass);
            if (mon != NON_MONSTER)
```
[120.9476]
[25.1005320]
```
            if (monsters* m = monster_at(pass))
```
Deletion in crawl-ref/source/delay.cc at line 1145 [26.3963459]
B:BD[25.1005334] → [105.51504:51546]
```
                monsters* m = &menv[mon];
```

Replacement in crawl-ref/source/delay.cc at line 1147 [26.3963459]

B:BD[105.51607] → [105.51607:51662]

                    monster_teleport( m, true, true );

[105.51607]

[25.1005417]

                    monster_teleport(m, true, true);

Replacement in crawl-ref/source/decks.cc at line 1741 [26.3987460]
B:BD[30.1141] → [29.14578:14617]
∅:D[29.14617] → [30.1179:1213]
B:BD[30.1179] → [30.1179:1213]
```
        const int mnstr = mgrd(where);
        if (mnstr == NON_MONSTER)
```
[30.1141]
[77.3489]
```
        monsters* mon = monster_at(where);
        if (mon == NULL)
```
Deletion in crawl-ref/source/decks.cc at line 1744 [26.3987460]
∅:D[77.3513] → [30.1235:1273]
B:BD[30.1235] → [30.1235:1273]
```
        monsters& mon = menv[mnstr];
```

Replacement in crawl-ref/source/decks.cc at line 1745 [26.3987460]

B:BD[30.1274] → [11.3204:3255]

∅:D[122.3135] → [30.1322:1383]

∅:D[11.3255] → [30.1322:1383]

B:BD[30.1322] → [30.1322:1383]

        if (!mon.drain_exp(&you, false, pow / 50))
            simple_monster_message(&mon, " is unaffected.");

[30.1274]

[123.5726]

        if (mon->drain_exp(&you, false, pow / 50))
            simple_monster_message(mon, " is unaffected.");

Replacement in crawl-ref/source/decks.cc at line 2534 [26.3987460]
B:BD[69.3906] → [124.20789:20831]
```
            if (pos.x >= 0 && pos.y >= 0)
```
[69.3906]
[68.1936]
```
            if (in_bounds(pos))
```
Replacement in crawl-ref/source/debug.cc at line 5602 [26.4016436]
∅:D[13.3845] → [125.3123:3150]
∅:D[15.101292] → [125.3123:3150]
B:BD[125.3123] → [125.3123:3150]
```
    monsters* mon2 = NULL;
```
[13.3845]
[99.3785]
```
    monsters* mon2 = monster_at(moves.target);
```
Deletion in crawl-ref/source/debug.cc at line 5604 [26.4016436]
B:BD[99.3786] → [99.3786:3815]
B:BD[99.3821] → [99.3821:3849]
∅:D[99.3933] → [97.16553:16554]
B:BD[97.16553] → [97.16553:16554]
```
    if (mid2 != NON_MONSTER)
        mon2 = &menv[mid2];
```
Replacement in crawl-ref/source/beam.cc at line 1507 [26.4128068]
B:BD[126.10873] → [126.10873:10912]
```
        const int midx = mgrd(source);
```
[126.10873]
[127.6137]
```
        const monsters* mon = monster_at(source);
```

Replacement in crawl-ref/source/beam.cc at line 1513 [26.4128068]

B:BD[126.11052] → [126.11052:11119]

            && (midx == NON_MONSTER || !you.can_see(&menv[midx])))

[126.11052]

[127.6325]

            && (!mon || !you.can_see(mon)))

Replacement in crawl-ref/source/beam.cc at line 1799 [26.4128068]

B:BD[126.17744] → [126.17744:17793]

B:BD[126.17793] → [128.3861:3909]

        if (!invalid_monster_index(mgrd(pos())))
            affect_monster(&menv[mgrd(pos())]);

[126.17744]

[126.17843]

        if (monsters* m = monster_at(pos()))
            affect_monster(m);

Deletion in crawl-ref/source/beam.cc at line 1830 [26.4128068]
B:BD[126.18387] → [126.18387:18424]
∅:D[129.8764] → [26.4176175:4176176]
∅:D[130.13407] → [26.4176175:4176176]
∅:D[126.18424] → [26.4176175:4176176]
∅:D[105.57116] → [26.4176175:4176176]
∅:D[25.1230195] → [26.4176175:4176176]
B:BD[26.4176175] → [26.4176175:4176176]
```
        const int mid = mgrd(pos());
```
Replacement in crawl-ref/source/beam.cc at line 1831 [26.4128068]
B:BD[126.18457] → [126.18457:18498]
```
        if (!invalid_monster_index(mid))
```
[126.18457]
[26.4176382]
```
        if (monsters* mon = monster_at(pos()))
```
Deletion in crawl-ref/source/beam.cc at line 1833 [26.4128068]
B:BD[26.4176392] → [126.18499:18545]
```
            monsters* const mon = &menv[mid];
```

Replacement in crawl-ref/source/beam.cc at line 1850 [26.4128068]

B:BD[126.19083] → [126.19083:19143]

B:BD[126.19143] → [7.2851:2895]

    if (!still_wall && !invalid_monster_index(mgrd(pos())))
        affect_monster(&menv[mgrd(pos())]);

[126.19083]

[26.4176783]

    if (!still_wall)
        if (monsters* m = monster_at(pos()))
            affect_monster(m);

Insertion in crawl-ref/source/beam.cc at line 2883 [26.4128068]
[26.4205460]
[131.32202]
```
            monsters* m = monster_at(pos());
```

Replacement in crawl-ref/source/beam.cc at line 2886 [26.4128068]

B:BD[126.26820] → [126.26820:26924]

                || mgrd(pos()) != NON_MONSTER &&
                   mons_is_caught(&menv[mgrd(pos())]))

[126.26820]

[132.4880]

                || m && mons_is_caught(m))

Replacement in crawl-ref/source/beam.cc at line 3104 [26.4128068]
B:BD[26.4220726] → [105.62311:62370]
```
        if (grd(p) == DNGN_FLOOR && mgrd(p) == NON_MONSTER
```
[26.4220726]
[26.4220791]
```
        if (grd(p) == DNGN_FLOOR && !monster_at(p)
```

Replacement in crawl-ref/source/beam.cc at line 3326 [26.4128068]

B:BD[126.32834] → [126.32834:32909]

    else if (mgrd(pos()) != NON_MONSTER)
        reflector = mgrd(source);

[126.32834]

[133.13108]

    else if (monsters* m = monster_at(pos()))
        reflector = m->mindex();

Replacement in crawl-ref/source/acr.cc at line 2963 [26.4397395]
B:BD[26.4464832] → [15.107204:107243]
```
        const int mon = mgrd(doorpos);
```
[26.4464832]
[26.4464870]
```
        monsters* mon = monster_at(doorpos);
```

Replacement in crawl-ref/source/acr.cc at line 2965 [26.4397395]

B:BD[26.4464871] → [134.1348:1418]

        if (mon != NON_MONSTER && player_can_hit_monster(&menv[mon]))

[26.4464871]

[26.4464951]

        if (mon && player_can_hit_monster(mon))

Replacement in crawl-ref/source/acr.cc at line 2967 [26.4397395]
B:BD[135.27066] → [135.27066:27110]
```
            if (mons_is_caught(&menv[mon]))
```
[26.4464961]
[135.27110]
```
            if (mons_is_caught(mon))
```

Replacement in crawl-ref/source/acr.cc at line 2969 [26.4397395]

B:BD[135.27125] → [135.27125:27323]

                std::string prompt  = "Do you want to try to take the net off ";
                            prompt += (&menv[mon])->name(DESC_NOCAP_THE);
                            prompt += '?';

[135.27124]

[135.27323]

                const std::string prompt =
                    make_stringf("Do you want to try to take the net off %s?",
                                 mon->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/acr.cc at line 2975 [26.4397395]

B:BD[135.27396] → [135.27396:27445]

                    remove_net_from(&menv[mon]);

[135.27396]

[135.27445]

                    remove_net_from(mon);

Replacement in crawl-ref/source/acr.cc at line 2982 [26.4397395]
B:BD[25.1279584] → [15.107244:107289]
```
            you_attack(mgrd(doorpos), true);
```
[25.1279584]
[26.4465039]
```
            you_attack(mon->mindex(), true);
```
Replacement in crawl-ref/source/acr.cc at line 3175 [26.4397395]
B:BD[136.4390] → [73.12810:12851]
```
            if (mgrd(dc) != NON_MONSTER)
```
[136.4390]
[136.4439]
```
            if (monsters* mon = monster_at(dc))
```

Replacement in crawl-ref/source/acr.cc at line 3179 [26.4397395]

B:BD[124.25167] → [73.12852:12914]

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

[124.25167]

[137.4130]

                if (!player_monster_visible(mon))

Replacement in crawl-ref/source/acr.cc at line 3578 [26.4397395]
B:BD[105.66182] → [105.66182:66232]
```
    const unsigned short targ_monst = mgrd(targ);
```
[105.66182]
[105.66232]
```
          monsters*      targ_monst = monster_at(targ);
```

Replacement in crawl-ref/source/acr.cc at line 3583 [26.4397395]

∅:D[138.3281] → [139.2722:2781]

∅:D[140.3413] → [139.2722:2781]

∅:D[124.25445] → [139.2722:2781]

B:BD[141.18779] → [139.2722:2781]

B:BD[139.2781] → [142.4660:4735]

∅:D[142.4735] → [140.3414:3487]

B:BD[139.2781] → [140.3414:3487]

    const bool can_swap_places = targ_monst != NON_MONSTER
                                 && !mons_is_stationary(&menv[targ_monst])
                                 && (mons_wont_attack(&menv[targ_monst])

[124.25445]

[143.4214]

    const bool can_swap_places = targ_monst
                                 && !mons_is_stationary(targ_monst)
                                 && (mons_wont_attack(targ_monst)

Replacement in crawl-ref/source/acr.cc at line 3618 [26.4397395]

B:BD[26.4475037] → [25.1281051:1281127]

    if (targ_monst != NON_MONSTER && !mons_is_submerged(&menv[targ_monst]))

[26.4474755]

[26.4475072]

    if (targ_monst && !mons_is_submerged(targ_monst))

Deletion in crawl-ref/source/acr.cc at line 3620 [26.4397395]
B:BD[26.4475078] → [78.6913:6956]
∅:D[78.6956] → [26.4475128:4475129]
B:BD[26.4475128] → [26.4475128:4475129]
```
        monsters *mon = &menv[targ_monst];
```

Replacement in crawl-ref/source/acr.cc at line 3622 [26.4397395]

B:BD[26.4475406] → [144.4051:4099]

            if (swap_check(mon, mon_swap_dest))

[26.4475406]

[25.1281164]

            if (swap_check(targ_monst, mon_swap_dest))

Replacement in crawl-ref/source/acr.cc at line 3635 [26.4397395]
B:BD[25.1281326] → [145.17682:17726]
```
            you_attack( targ_monst, true );
```
[25.1281326]
[26.4475514]
```
            you_attack(targ_monst->mindex(), true);
```

Replacement in crawl-ref/source/acr.cc at line 3654 [26.4397395]

B:BD[144.4195] → [144.4195:4254]

            swap_places(&menv[targ_monst], mon_swap_dest);

[144.4195]

[146.3287]

            swap_places(targ_monst, mon_swap_dest);

Insertion in crawl-ref/source/abyss.cc at line 24 [26.4482606]
[147.5032]
[26.4483016]
```
#include "mon-util.h"
```

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

B:BD[63.16571] → [73.17506:17598]

        if (mgrd(*ri) != NON_MONSTER)
            _abyss_lose_monster( menv[ mgrd(*ri) ] );

[63.16571]

[73.17598]

        if (monsters* m = monster_at(*ri))
            _abyss_lose_monster(*m);

Replacement in crawl-ref/source/abl-show.cc at line 2421 [26.4494389]
B:BD[148.1025] → [29.15000:15057]
```
    if (!in_bounds(where) || mgrd(where) == NON_MONSTER)
```
[148.1025]
[148.1080]
```
    if (!in_bounds(where))
```

Replacement in crawl-ref/source/abl-show.cc at line 2424 [26.4494389]

B:BD[148.1101] → [29.15058:15099]

    monsters &mon = menv[ mgrd(where) ];

[148.1101]

[148.1141]

    monsters* mon = monster_at(where);
    if (mon == NULL)
        return (0);

Replacement in crawl-ref/source/abl-show.cc at line 2428 [26.4494389]

B:BD[148.1142] → [148.1142:1224]

    if (!mons_friendly(&mon))
        behaviour_event( &mon, ME_ANNOY, MHITYOU );

[148.1142]

[149.7822]

    if (!mons_friendly(mon))
        behaviour_event(mon, ME_ANNOY, MHITYOU);

Replacement in crawl-ref/source/abl-show.cc at line 2431 [26.4494389]
∅:D[149.7823] → [148.1229:1277]
B:BD[148.1229] → [148.1229:1277]
```
    if (check_mons_resist_magic(&mon, pow * 2))
```
[149.7823]
[148.1277]
```
    if (check_mons_resist_magic(mon, pow * 2))
```

Replacement in crawl-ref/source/abl-show.cc at line 2434 [26.4494389]

B:BD[150.2315] → [150.2315:2387]

             mon.name(DESC_CAP_THE).c_str(), mons_resist_string(&mon));

[150.2315]

[148.1344]

             mon->name(DESC_CAP_THE).c_str(), mons_resist_string(mon));

Replacement in crawl-ref/source/abl-show.cc at line 2439 [26.4494389]

B:BD[151.603] → [151.603:723]

    if (mon.type == MONS_BLINK_FROG)
        mon.heal(damage, false);
    else if (!check_mons_resist_magic(&mon, pow))

[151.603]

[148.1416]

    if (mon->type == MONS_BLINK_FROG)
        mon->heal(damage, false);
    else if (!check_mons_resist_magic(mon, pow))

Replacement in crawl-ref/source/abl-show.cc at line 2443 [26.4494389]
B:BD[148.1422] → [151.724:756]
∅:D[151.756] → [148.1468:1494]
B:BD[148.1468] → [148.1468:1494]
```
        mon.hurt(&you, damage);
        if (!mon.alive())
```
[148.1422]
[148.1494]
```
        mon->hurt(&you, damage);
        if (!mon->alive())
```
Replacement in crawl-ref/source/abl-show.cc at line 2448 [26.4494389]
B:BD[148.1525] → [148.1525:1542]
```
    mon.blink();
```
[148.1525]
[148.1542]
```
    mon->blink();
```

Remove a great many cases where mgrd is accessed directly in favour

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 1316 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1326 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1786 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1814 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1843 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 1876 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 2646 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 2661 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 3809 [16.5936]

Replacement in crawl-ref/source/tutorial.cc at line 3812 [16.5936]

Deletion in crawl-ref/source/tutorial.cc at line 3814 [16.5936]

Replacement in crawl-ref/source/travel.cc at line 847 [24.39949]

Deletion in crawl-ref/source/travel.cc at line 849 [24.39949]

Deletion in crawl-ref/source/travel.cc at line 853 [24.39949]

Replacement in crawl-ref/source/travel.cc at line 1417 [24.39949]

Deletion in crawl-ref/source/travel.cc at line 1419 [24.39949]

Replacement in crawl-ref/source/travel.cc at line 4027 [24.39949]

Replacement in crawl-ref/source/stuff.cc at line 346 [26.224557]

Deletion in crawl-ref/source/stuff.cc at line 350 [26.224557]

Deletion in crawl-ref/source/stuff.cc at line 1658 [26.224557]

Deletion in crawl-ref/source/stuff.cc at line 1667 [26.224557]

Replacement in crawl-ref/source/stuff.cc at line 1670 [26.224557]

Replacement in crawl-ref/source/spl-util.cc at line 532 [26.245665]

Replacement in crawl-ref/source/spells4.cc at line 396 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 400 [26.436250]

Deletion in crawl-ref/source/spells4.cc at line 405 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 408 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 410 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 414 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 416 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 419 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 451 [26.436250]

Deletion in crawl-ref/source/spells4.cc at line 454 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 558 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 560 [26.436250]

Deletion in crawl-ref/source/spells4.cc at line 563 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 590 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 771 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 786 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 788 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 792 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 798 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 875 [26.436250]

Deletion in crawl-ref/source/spells4.cc at line 879 [26.436250]

Deletion in crawl-ref/source/spells4.cc at line 880 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 931 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 946 [26.436250]

Deletion in crawl-ref/source/spells4.cc at line 949 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 986 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1145 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1154 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1177 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1182 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1185 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1189 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1191 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1193 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1195 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1200 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1203 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1205 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1207 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1509 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1513 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1516 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1519 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1522 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1524 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1529 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1531 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1534 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1537 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1551 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1574 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1577 [26.436250]

Replacement in crawl-ref/source/spells4.cc at line 1579 [26.436250]