fiddlerwoaroof/crawl - Change 5FHWTG7M6FW4B3I33YI7QSM3OZIB6ZGC6TI6JISSLY5Y43HI56VAC

Redid monster death idiom so that monsters::hurt can implicitly

call monster_die(). (This behaviour can be overriden.) Minor code cleanups elsewhere, removal of dead code from bolt.

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

Created by haranp on October 4, 2008

5FHWTG7M6FW4B3I33YI7QSM3OZIB6ZGC6TI6JISSLY5Y43HI56VAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/traps.cc at line 474 [14.5308]

∅:D[10.251] → [13.8064:8210]

B:BD[13.8064] → [13.8064:8210]

                hurt_monster(m, damage_taken);
                if (m->hit_points < 1)
                    monster_die(m, KILL_MISC, NON_MONSTER);

[10.251]

[13.8210]

                m->hurt(NULL, damage_taken);
                if (in_sight && m->alive())
                    print_wounds(m);

Replacement in crawl-ref/source/traps.cc at line 1206 [14.5308]

B:BD[13.20851] → [10.268:317]

∅:D[10.317] → [13.20911:21014]

B:BD[13.20911] → [13.20911:21014]

            hurt_monster(monster, damage_taken);
            if (monster->hit_points < 1)
                monster_die(monster, KILL_MISC, NON_MONSTER);

[13.20851]

[14.22992]

            monster->hurt(NULL, damage_taken);

Deletion in crawl-ref/source/stuff.h at line 43 [15.217090]
B:BD[15.218692] → [15.218692:218738]
```
int roll_dice( const struct dice_def &dice );
```
Deletion in crawl-ref/source/stuff.h at line 45 [15.217090]
B:BD[16.317] → [16.317:318]

Deletion in crawl-ref/source/stuff.cc at line 651 [15.224557]

B:BD[15.230005] → [15.230005:230102]

}
int roll_dice( const struct dice_def &dice )
{
    return (roll_dice( dice.num, dice.size ));

Insertion in crawl-ref/source/stuff.cc at line 1671 [15.224557]

[17.257]


int dice_def::roll() const
{
    return roll_dice(this->num, this->size);
}

Replacement in crawl-ref/source/spl-cast.cc at line 2578 [15.293070]

B:BD[18.21101] → [18.21101:21181]

        hurt_monster(mon_target, dam);
        if (mon_target->hit_points < 1)

[18.21101]

[18.21181]

        mon_target->hurt(NULL, dam, BEAM_MISSILE, false);
        if (!mon_target->alive())

Insertion in crawl-ref/source/spells4.cc at line 77 [15.436250]
[15.440471]
[15.440471]
```
    monsters& m = menv[monster];
```

Replacement in crawl-ref/source/spells4.cc at line 81 [15.436250]

B:BD[15.440498] → [15.440498:440589]

B:BD[15.440589] → [19.149:282]

∅:D[19.282] → [15.440633:440656]

B:BD[15.440633] → [15.440633:440656]

B:BD[15.440656] → [20.382:446]

∅:D[20.446] → [15.440712:440749]

B:BD[15.440712] → [15.440712:440749]

        hurt_monster( &menv[monster], damage );
        if (menv[monster].hit_points > 0)
        {
            const monsters *mons = static_cast<const monsters*>(&menv[monster]);
            print_wounds(mons);
        }
        else
        {
            monster_die(&menv[monster], KILL_YOU, NON_MONSTER);
            return (true);
        }

[15.440498]

[15.440749]

        m.hurt(&you, damage);
        if (m.alive())
            print_wounds(&m);

Replacement in crawl-ref/source/spells4.cc at line 86 [15.436250]
B:BD[15.440756] → [15.440756:440776]
```
    return (false);
```
[15.440756]
[21.16645]
```
    return (!m.alive());
```

Replacement in crawl-ref/source/spells4.cc at line 175 [15.436250]

B:BD[15.443169] → [22.425:495]

    int damage = roll_dice( dam_dice ) - random2( menv[monster].ac );

[15.443169]

[15.443249]

    int damage = dam_dice.roll() - random2( menv[monster].ac );

Replacement in crawl-ref/source/spells4.cc at line 587 [15.436250]
B:BD[15.465039] → [15.465039:465079]
```
    int damage = roll_dice( dam_dice );
```
[15.465039]
[15.465079]
```
    int damage = dam_dice.roll();
```

Replacement in crawl-ref/source/spells4.cc at line 1737 [15.436250]

B:BD[23.1204] → [11.481:548]

            if (player_hurt_monster(midx, roll_dice(beam.damage)))

[23.1204]

[23.1270]

            if (player_hurt_monster(midx, beam.damage.roll()))

Replacement in crawl-ref/source/spells4.cc at line 1761 [15.436250]

B:BD[23.1501] → [11.683:754]

                if (player_hurt_monster(midx, roll_dice(beam.damage)))

[23.1501]

[23.1571]

                if (player_hurt_monster(midx, beam.damage.roll()))

Replacement in crawl-ref/source/spells4.cc at line 1774 [15.436250]

B:BD[23.1756] → [11.821:884]

            player_hurt_monster(midx, roll_dice(beam.damage));

[23.1756]

[15.504600]

            player_hurt_monster(midx, beam.damage.roll());

Replacement in crawl-ref/source/spells4.cc at line 1783 [15.436250]

B:BD[23.1982] → [11.885:952]

            if (player_hurt_monster(midx, roll_dice(beam.damage)))

[23.1982]

[23.2048]

            if (player_hurt_monster(midx, beam.damage.roll()))

Replacement in crawl-ref/source/spells4.cc at line 1796 [15.436250]

B:BD[23.2283] → [11.953:1020]

            if (player_hurt_monster(midx, roll_dice(beam.damage)))

[23.2283]

[23.2349]

            if (player_hurt_monster(midx, beam.damage.roll()))

Replacement in crawl-ref/source/spells4.cc at line 1818 [15.436250]

B:BD[24.2057] → [23.2747:2811]

                int statue_damage = roll_dice(beam.damage) * 2;

[24.2057]

[24.2122]

                int statue_damage = beam.damage.roll() * 2;

Replacement in crawl-ref/source/spells4.cc at line 1833 [15.436250]

B:BD[23.3051] → [11.1188:1255]

            if (player_hurt_monster(midx, roll_dice(beam.damage)))

[23.3051]

[23.3117]

            if (player_hurt_monster(midx, beam.damage.roll()))

Replacement in crawl-ref/source/spells4.cc at line 1850 [15.436250]

B:BD[11.1798] → [11.1798:1873]

                    if (player_hurt_monster(midx, roll_dice(beam.damage)))

[11.1798]

[11.1873]

                    if (player_hurt_monster(midx, beam.damage.roll()))

Replacement in crawl-ref/source/spells4.cc at line 2232 [15.436250]

∅:D[25.7333] → [15.517527:517597]

B:BD[15.517527] → [15.517527:517597]

B:BD[15.517597] → [20.512:565]

∅:D[20.565] → [15.517642:517697]

B:BD[15.517642] → [15.517642:517697]

    hurt_monster( monster, damage );
    if (monster->hit_points < 1)
        monster_die(monster, KILL_YOU, NON_MONSTER);
    else
        print_wounds( monster );
    return;

[25.7333]

[25.7334]

    monster->hurt(&you, damage);
    if (monster->alive())
        print_wounds(monster);

Replacement in crawl-ref/source/spells3.cc at line 224 [15.531613]
B:BD[26.686] → [26.686:754]
∅:D[19.411] → [15.537546:537547]
∅:D[26.754] → [15.537546:537547]
∅:D[27.861] → [15.537546:537547]
B:BD[15.537546] → [15.537546:537547]
B:BD[15.537547] → [26.755:796]
B:BD[26.796] → [20.568:629]
∅:D[20.629] → [26.847:864]
B:BD[26.847] → [26.847:864]
```
            hurt_monster(monster, 7 + (random2(power) * 33 / 191));
            if (monster->hit_points < 1)
                monster_die(monster, KILL_YOU, NON_MONSTER);
            else
```
[26.686]
[26.864]
```
            monster->hurt(&you, 7 + (random2(power) * 33 / 191));
            if (monster->alive())
```
Deletion in crawl-ref/source/spells3.cc at line 277 [15.531613]
∅:D[28.280] → [29.407:408]
∅:D[27.1477] → [29.407:408]
∅:D[26.1733] → [29.407:408]
B:BD[29.407] → [29.407:408]
B:BD[29.408] → [27.1478:1521]
```
            hurt_monster(monster, hurted);
```
Replacement in crawl-ref/source/spells3.cc at line 278 [15.531613]
∅:D[27.1522] → [15.538565:538606]
B:BD[15.538565] → [15.538565:538606]
B:BD[15.538606] → [20.630:691]
∅:D[20.691] → [15.538657:538674]
B:BD[15.538657] → [15.538657:538674]
```
            if (monster->hit_points < 1)
                monster_die(monster, KILL_YOU, NON_MONSTER);
            else
```
[27.1522]
[15.538674]
```
            monster->hurt(&you, hurted);
            if (monster->alive())
```

Replacement in crawl-ref/source/spells2.cc at line 643 [15.569242]

∅:D[30.319] → [31.1682:1759]

B:BD[31.1682] → [31.1682:1759]

    const int hurted = check_your_resists(roll_dice( dam_dice ), BEAM_COLD);

[30.319]

[15.591422]

    const int hurted = check_your_resists(dam_dice.roll(), BEAM_COLD);

Replacement in crawl-ref/source/spells2.cc at line 697 [15.569242]

∅:D[30.1391] → [31.1926:2006]

B:BD[15.592117] → [31.1926:2006]

B:BD[15.592231] → [31.2007:2033]

B:BD[31.2033] → [30.1392:1437]

            int hurt = mons_adjust_flavoured(monster,beam,roll_dice(dam_dice));
            if (hurt > 0)
                hurt_monster(monster, hurt);

[30.1391]

[15.592505]

            int hurt = mons_adjust_flavoured(monster, beam, dam_dice.roll());
            monster->hurt(&you, hurt, BEAM_COLD);

Replacement in crawl-ref/source/spells2.cc at line 700 [15.569242]

B:BD[15.592506] → [30.1438:1559]

B:BD[30.1559] → [20.694:755]

∅:D[20.755] → [30.1610:1691]

B:BD[30.1610] → [30.1610:1691]

            // Kill monster if necessary; cold-blooded creatures can be slowed.
            if (monster->hit_points < 1)
                monster_die(monster, KILL_YOU, NON_MONSTER);
            else if (mons_class_flag(monster->type, M_COLD_BLOOD) && coinflip())

[15.592506]

[30.1691]

            // Cold-blooded creatures can be slowed.
            if (monster->alive()
                && mons_class_flag(monster->type, M_COLD_BLOOD)
                && coinflip())
            {

Insertion in crawl-ref/source/spells2.cc at line 706 [15.569242]
[30.1737]
[15.592736]
```
            }
```
Deletion in crawl-ref/source/spells2.cc at line 747 [15.569242]
B:BD[15.593831] → [15.593831:593874]
```
            hurt_monster(monster, hurted);
```

Replacement in crawl-ref/source/spells2.cc at line 749 [15.569242]

B:BD[15.593907] → [15.593907:593948]

B:BD[15.593948] → [20.756:817]

∅:D[20.817] → [15.593999:594016]

B:BD[15.593999] → [15.593999:594016]

            if (monster->hit_points < 1)
                monster_die(monster, KILL_YOU, NON_MONSTER);
            else

[15.593907]

[15.594016]

            monster->hurt(&you, hurted);
            if (monster->alive())

Deletion in crawl-ref/source/spells2.cc at line 807 [15.569242]
B:BD[15.595676] → [15.595676:595715]
```
    hurt_monster(monster, inflicted);
```
Replacement in crawl-ref/source/spells2.cc at line 810 [15.569242]
B:BD[15.595875] → [15.595875:595902]
```
    print_wounds(monster);
```
[15.595875]
[15.595902]
```
    monster->hurt(&you, inflicted);
```

Replacement in crawl-ref/source/spells2.cc at line 812 [15.569242]

B:BD[15.595903] → [15.595903:595936]

B:BD[15.595936] → [20.818:871]

    if (monster->hit_points < 1)
        monster_die(monster, KILL_YOU, NON_MONSTER);

[15.595903]

[15.595979]

    if (monster->alive())
        print_wounds(monster);

Replacement in crawl-ref/source/player.cc at line 6453 [15.962854]

B:BD[22.5682] → [7.2421:2489]

int player::hurt(const actor *agent, int amount, beam_type flavour)

[22.5682]

[22.5726]

int player::hurt(const actor *agent, int amount, beam_type flavour,
                 bool cleanup_dead)

Insertion in crawl-ref/source/player.cc at line 6456 [15.962854]
[22.5728]
[32.338]
```
    // We ignore cleanup_dead here.
```
Replacement in crawl-ref/source/ouch.cc at line 807 [15.1104358]
B:BD[9.3000] → [9.3000:3032]
```
        hurt_monster(mon, dam);
```
[9.3000]
[9.3032]
```
        mon->hurt(&you, dam);
```

Replacement in crawl-ref/source/ouch.cc at line 809 [15.1104358]

B:BD[9.3033] → [9.3033:3132]

        if (mon->hit_points < 1)
            monster_die(mon, KILL_YOU, NON_MONSTER);
        else

[9.3033]

[9.3132]

        if (mon->alive())

Deletion in crawl-ref/source/mstuff2.cc at line 1822 [15.1340842]
∅:D[33.20872] → [34.409448:409480]
B:BD[34.409448] → [34.409448:409480]
```
        beam.is_enchant = true;
```

Replacement in crawl-ref/source/monstuff.h at line 186 [15.1390580]

B:BD[15.1395959] → [35.2544:2629]

void mons_get_damage_level(const monsters*, std::string& desc, mon_dam_level_type&);

[15.1395959]

void mons_get_damage_level(const monsters*, std::string& desc,
                           mon_dam_level_type&);

Replacement in crawl-ref/source/monstuff.cc at line 1971 [15.1396662]

B:BD[35.4038] → [36.2634:2663]

∅:D[37.2626] → [15.1434124:1434238]

∅:D[36.2663] → [15.1434124:1434238]

B:BD[15.1434124] → [15.1434124:1434238]

    if (monster->type == -1)
        return;
    if (monster->hit_points == monster->max_hit_points
        || monster->hit_points < 1)
    {

[35.4038]

[15.1434238]

    if (!monster->alive() || monster->hit_points == monster->max_hit_points)

Deletion in crawl-ref/source/monstuff.cc at line 1973 [15.1396662]
B:BD[15.1434254] → [15.1434254:1434260]
```
    }
```
Deletion in crawl-ref/source/monstuff.cc at line 7394 [15.1396662]
B:BD[38.245678] → [39.2558:2559]
B:BD[39.2559] → [40.2858:2892]
```
    hurted = std::max(0, hurted);
```
Replacement in crawl-ref/source/monstuff.cc at line 7401 [15.1396662]
∅:D[41.589] → [15.1552166:1552205]
B:BD[15.1552166] → [15.1552166:1552205]
```
        hurt_monster(monster, hurted);
```
[41.589]
[15.1552205]
```
        monster->hurt(NULL, hurted, BEAM_MISSILE, false);
```

Replacement in crawl-ref/source/mon-util.cc at line 4954 [15.1699344]

B:BD[42.1558] → [7.2520:2590]

int monsters::hurt(const actor *agent, int amount, beam_type flavour)

[42.1558]

[22.15493]

int monsters::hurt(const actor *agent, int amount, beam_type flavour,
                   bool cleanup_dead)

Replacement in crawl-ref/source/mon-util.cc at line 4957 [15.1699344]

B:BD[22.15495] → [22.15495:15516]

    if (amount <= 0)

[22.15495]

[43.2723]

    if (amount == INSTANT_DEATH)
        amount = hit_points;
    else if (amount <= 0)

Replacement in crawl-ref/source/mon-util.cc at line 4968 [15.1699344]
∅:D[44.11740] → [43.2902:2967]
B:BD[43.2902] → [43.2902:2967]
```
    if (agent && (hit_points < 1 || hit_dice < 1) && type != -1)
```
[44.11740]
[22.15619]
```
    if (cleanup_dead && (hit_points < 1 || hit_dice < 1) && type != -1)
```

Replacement in crawl-ref/source/mon-util.cc at line 4970 [15.1699344]

B:BD[22.15625] → [22.15625:15667]

        if (agent->atype() == ACT_PLAYER)

[22.15625]

[20.3468]

        if (agent == NULL)
            monster_die(this, KILL_MISC, NON_MONSTER);
        else if (agent->atype() == ACT_PLAYER)

Replacement in crawl-ref/source/mon-util.cc at line 6144 [15.1699344]

B:BD[45.22557] → [40.3145:3182]

            hurt_monster(this, dam);

[45.22557]

[45.22596]

            // We don't have a reasonable agent to give.
            // Don't clean up the monster in order to credit properly.
            this->hurt(NULL, dam, BEAM_POISON, false);

Insertion in crawl-ref/source/mon-util.cc at line 6155 [15.1699344]
[45.22920]
[45.22920]
```
            // Credit the kill.
```

Replacement in crawl-ref/source/mon-util.cc at line 6170 [15.1699344]

B:BD[45.23370] → [45.23370:23405]

            hurt_monster(this, 1);

[45.23370]

[46.7002]

            this->hurt(NULL, 1); // nonlethal so we don't care about agent

Replacement in crawl-ref/source/mon-util.cc at line 6182 [15.1699344]

B:BD[45.23798] → [47.14767:14785]

B:BD[47.14785] → [48.4990:5109]

        int dam =
            resist_adjust_damage(this, BEAM_FIRE, res_fire(),
                                 roll_dice( 2, 4 ) - 1);

[45.23798]

[45.23839]

        int dam = resist_adjust_damage(this, BEAM_FIRE, res_fire(),
                                       roll_dice(2, 4) - 1);

Deletion in crawl-ref/source/mon-util.cc at line 6187 [15.1699344]
B:BD[45.24251] → [40.3183:3220]
```
            hurt_monster(this, dam);
```

Insertion in crawl-ref/source/mon-util.cc at line 6188 [15.1699344]

[45.24343]

            // We don't have a reasonable agent to give.
            // Don't clean up the monster in order to credit properly.
            this->hurt(NULL, dam, BEAM_NAPALM, false);

Insertion in crawl-ref/source/mon-util.cc at line 6196 [15.1699344]
[45.24445]
[45.24445]
```
            // Credit the kill.
```

Deletion in crawl-ref/source/items.cc at line 367 [15.2584728]

B:BD[15.2593967] → [15.2593967:2594106]

B:BD[15.2594106] → [20.3656:3730]


                    // This causes problems when changing levels. -- bwr
                    // if (monster->type == MONS_DANCING_WEAPON)
                    //     monster_die(monster, KILL_RESET, NON_MONSTER);

Replacement in crawl-ref/source/fight.cc at line 1192 [15.3140790]

B:BD[15.3158329] → [49.547:596]

    aux_damage  = hurt_monster(def, aux_damage);

[15.3158329]

[50.790]

    aux_damage  = def->hurt(&you, aux_damage, BEAM_MISSILE, false);

Deletion in crawl-ref/source/fight.cc at line 1224 [15.3140790]
∅:D[51.42449] → [15.3158933:3158939]
B:BD[15.3158933] → [15.3158933:3158939]
```
    {
```
Deletion in crawl-ref/source/fight.cc at line 1225 [15.3140790]
∅:D[20.3806] → [51.42489:42512]
B:BD[51.42489] → [51.42489:42512]
∅:D[51.42512] → [15.3159019:3159025]
B:BD[15.3159019] → [15.3159019:3159025]
```
        return (true);
    }
```
Replacement in crawl-ref/source/fight.cc at line 1226 [15.3140790]
B:BD[15.3159026] → [51.42513:42533]
```
    return (false);
```
[15.3159026]
[51.42533]
```
    return (!def->alive());
```

Replacement in crawl-ref/source/fight.cc at line 1722 [15.3140790]

B:BD[51.54009] → [49.597:671]

    return damage_done && (damage_done = hurt_monster(def, damage_done));

[51.54009]

[51.54067]

    return damage_done && (damage_done = def->hurt(&you, damage_done,
                                                   BEAM_MISSILE, false));

Deletion in crawl-ref/source/fight.cc at line 1852 [15.3140790]
∅:D[2.2886] → [52.533:534]
∅:D[51.56323] → [52.533:534]
B:BD[52.533] → [52.533:534]
B:BD[52.534] → [49.960:1016]
```
    special_damage = hurt_monster(def, special_damage);
```
Replacement in crawl-ref/source/fight.cc at line 1853 [15.3140790]
B:BD[15.3169327] → [51.56401:56436]
B:BD[51.56436] → [20.3807:3856]
∅:D[20.3856] → [51.56475:56498]
B:BD[51.56475] → [51.56475:56498]
∅:D[51.56498] → [15.3169639:3169645]
B:BD[15.3169639] → [15.3169639:3169645]
```
    if (def->hit_points < 1)
    {
        monster_die(def, KILL_YOU, NON_MONSTER);
        return (true);
    }
```
[22.57659]
[15.3169681]
```
    special_damage = def->hurt(&you, special_damage);
```
Replacement in crawl-ref/source/fight.cc at line 1855 [15.3140790]
B:BD[15.3169682] → [51.56499:56519]
```
    return (false);
```
[15.3169682]
[48.5534]
```
    return (!def->alive());
```

Replacement in crawl-ref/source/externs.h at line 306 [15.3270163]

B:BD[7.2910] → [7.2910:2970]

                     beam_type flavour = BEAM_MISSILE) = 0;

[7.2910]

[22.84312]

                     beam_type flavour = BEAM_MISSILE,
                     bool cleanup_dead = true) = 0;

Insertion in crawl-ref/source/externs.h at line 408 [15.3270163]
[15.3272264]
[15.3272831]
```
    int roll() const;
```

Replacement in crawl-ref/source/externs.h at line 897 [15.3270163]

B:BD[7.3019] → [7.3019:3067]

             beam_type flavour = BEAM_MISSILE);

[7.3019]

[22.87177]

             beam_type flavour = BEAM_MISSILE,
             bool cleanup_dead = true);

Replacement in crawl-ref/source/externs.h at line 1298 [15.3270163]

B:BD[7.3174] → [7.3174:3222]

             beam_type flavour = BEAM_MISSILE);

[7.3174]

[22.89390]

             beam_type flavour = BEAM_MISSILE,
             bool cleanup_dead = true);

Replacement in crawl-ref/source/enum.h at line 178 [15.3287960]
B:BD[15.3296306] → [48.7866:7908]
```
    BEAM_NONE,                    //    0
```
[15.3296306]
[53.10654]
```
    BEAM_NONE,
```
Replacement in crawl-ref/source/enum.h at line 184 [15.3287960]
B:BD[15.3296456] → [54.3954:3994]
```
    BEAM_MAGIC,                   //  5
```
[15.3296456]
[48.8006]
```
    BEAM_MAGIC,
```
Replacement in crawl-ref/source/enum.h at line 189 [15.3287960]
B:BD[34.904999] → [54.3995:4035]
```
    BEAM_MIASMA,                  // 10
```
[34.904999]
[48.8029]
```
    BEAM_MIASMA,
```
Replacement in crawl-ref/source/enum.h at line 195 [15.3287960]
B:BD[34.905178] → [54.4036:4076]
```
    BEAM_STEAM,                   // 15
```
[34.905178]
[34.905220]
```
    BEAM_STEAM,
```
Replacement in crawl-ref/source/enum.h at line 198 [15.3287960]
B:BD[34.905257] → [48.8064:8139]
```
    BEAM_HOLY,                    //   aka beam of cleansing, golden flame
```
[34.905257]
[15.3296881]
```
    BEAM_HOLY,
```
Replacement in crawl-ref/source/enum.h at line 200 [15.3287960]
B:BD[15.3296896] → [54.4077:4117]
```
    BEAM_LAVA,                    // 20
```
[15.3296896]
[15.3296938]
```
    BEAM_LAVA,
```

Replacement in crawl-ref/source/enum.h at line 207 [15.3287960]

B:BD[15.3297135] → [15.3297135:3297350]

B:BD[15.3297350] → [54.4198:4242]

∅:D[54.4242] → [15.3297389:3297562]

B:BD[15.3297389] → [15.3297389:3297562]

B:BD[15.3297562] → [54.4243:4293]

∅:D[54.4293] → [15.3297607:3297790]

B:BD[15.3297607] → [15.3297607:3297790]

B:BD[15.3297790] → [54.4294:4341]

∅:D[54.4341] → [15.3297832:3297920]

B:BD[15.3297832] → [15.3297832:3297920]

    // These used to be handled in the colour field:
    BEAM_SLOW,                  // BLACK
    BEAM_HASTE,                 // BLUE
    BEAM_HEALING,               // GREEN
    BEAM_PARALYSIS,             // CYAN
    BEAM_CONFUSION,             // RED - 30
    BEAM_INVISIBILITY,          // MAGENTA
    BEAM_DIGGING,               // BROWN
    BEAM_TELEPORT,              // LIGHTGREY
    BEAM_POLYMORPH,             // DARKGREY
    BEAM_CHARM,                 // LIGHTBLUE - 35
    BEAM_BANISH,                // LIGHTGREEN
    BEAM_DEGENERATE,            // LIGHTCYAN
    BEAM_ENSLAVE_UNDEAD,        // LIGHTRED
    BEAM_PAIN,                  // LIGHTMAGENTA
    BEAM_DISPEL_UNDEAD,         // YELLOW - 40
    BEAM_DISINTEGRATION,        // WHITE
    BEAM_ENSLAVE_DEMON,         // colour "16"

[15.3297135]

[34.905338]

    // Enchantments
    BEAM_FIRST_ENCHANTMENT,
    BEAM_SLOW = BEAM_FIRST_ENCHANTMENT,
    BEAM_HASTE,
    BEAM_HEALING,
    BEAM_PARALYSIS,
    BEAM_CONFUSION,
    BEAM_INVISIBILITY,
    BEAM_DIGGING,
    BEAM_TELEPORT,
    BEAM_POLYMORPH,
    BEAM_CHARM,
    BEAM_BANISH,
    BEAM_DEGENERATE,
    BEAM_ENSLAVE_UNDEAD,
    BEAM_PAIN,
    BEAM_DISPEL_UNDEAD,
    BEAM_DISINTEGRATION,
    BEAM_ENSLAVE_DEMON,

Insertion in crawl-ref/source/enum.h at line 228 [15.3287960]
[34.905372]
[15.3297920]
```
    BEAM_LAST_ENCHANTMENT = BEAM_PETRIFY,
```
Replacement in crawl-ref/source/enum.h at line 231 [15.3287960]
B:BD[15.3297952] → [54.4342:4380]
```
    BEAM_POTION_STINKING_CLOUD, // 45
```
[15.3297952]
[15.3297984]
```
    BEAM_POTION_STINKING_CLOUD,
```
Replacement in crawl-ref/source/enum.h at line 236 [15.3287960]
B:BD[15.3298077] → [54.4381:4419]
```
    BEAM_POTION_COLD,           // 50
```
[15.3298077]
[15.3298099]
```
    BEAM_POTION_COLD,
```
Replacement in crawl-ref/source/enum.h at line 241 [15.3287960]
B:BD[15.3298184] → [54.4420:4458]
```
    BEAM_POTION_RANDOM,         // 55
```
[15.3298184]
[7.3224]
```
    BEAM_POTION_RANDOM,
```
Replacement in crawl-ref/source/effects.cc at line 116 [15.3382105]
B:BD[55.4047] → [56.13940:13967]
```
    int mon = mgrd(where);
```
[55.4047]
[55.4073]
```
    const int mon = mgrd(where);
```

Replacement in crawl-ref/source/effects.cc at line 123 [15.3382105]

B:BD[55.4163] → [57.2676:2737]

    if (invalid_monster(monster) || !mons_is_unholy(monster)

[55.4163]

[57.2737]

    if (!monster->alive()
        || !mons_is_unholy(monster)

Replacement in crawl-ref/source/effects.cc at line 131 [15.3382105]

B:BD[55.4344] → [3.2744:2813]

    int hploss = std::max(0, roll_dice(2, 15) + (random2(pow) / 3));

[55.4344]

[58.2856]

    const int hploss = roll_dice(2, 15) + (random2(pow) / 3);
    retval = 1;

Replacement in crawl-ref/source/effects.cc at line 138 [15.3382105]
∅:D[8.2593] → [55.4434:4469]
B:BD[55.4434] → [55.4434:4469]
∅:D[55.4469] → [59.7450:7451]
B:BD[59.7450] → [59.7450:7451]
B:BD[59.7451] → [55.4470:4486]
```
    hurt_monster(monster, hploss);
    if (hploss)
```
[8.2593]
[55.4486]
```
    monster->hurt(&you, hploss);
   
    if (monster->alive())
```

Replacement in crawl-ref/source/effects.cc at line 142 [15.3382105]

B:BD[55.4492] → [55.4492:4512]

B:BD[55.4512] → [60.2676:2717]

B:BD[60.2717] → [20.3911:3968]

∅:D[20.3968] → [60.2718:2755]

B:BD[55.4610] → [60.2718:2755]

∅:D[60.2755] → [55.4610:4616]

B:BD[55.4610] → [55.4610:4616]

        retval = 1;
        if (!monster->alive())
        {
            monster_die(monster, KILL_YOU, NON_MONSTER);
            return retval;
        }
    }

[55.4492]

[60.2756]

        if (monster->speed_increment >= 25)
            monster->speed_increment -= 20;

Replacement in crawl-ref/source/effects.cc at line 145 [15.3382105]

B:BD[59.7512] → [55.4617:4723]

    if (monster->speed_increment >= 25)
    {
        retval = 1;
        monster->speed_increment -= 20;

[60.2757]

[55.4723]

        monster->add_ench(ENCH_FEAR);

Deletion in crawl-ref/source/effects.cc at line 148 [15.3382105]
B:BD[59.7650] → [55.4730:4788]
∅:D[55.4788] → [59.7796:7797]
B:BD[59.7796] → [59.7796:7797]
```
    if (monster->add_ench(ENCH_FEAR))
        retval = 1;
```

Replacement in crawl-ref/source/effects.cc at line 241 [15.3382105]

B:BD[15.3383716] → [61.3001:3077]

    if (invalid_monster(monster) || mons_res_negative_energy(monster) == 3)

[15.3383716]

[55.5348]

    if (!monster->alive() || mons_res_negative_energy(monster) == 3)

Deletion in crawl-ref/source/effects.cc at line 254 [15.3382105]
B:BD[60.2841] → [60.2841:2851]
B:BD[60.2851] → [20.3969:4026]
```
        {
            monster_die(monster, KILL_YOU, NON_MONSTER);
```
Deletion in crawl-ref/source/effects.cc at line 255 [15.3382105]
B:BD[60.2879] → [60.2879:2889]
```
        }
```
Replacement in crawl-ref/source/beam.h at line 21 [15.4124541]
B:BD[14.102747] → [14.102747:102794]
```
    DMNBM_HELLFIRE,                    //    0
```
[14.102747]
[14.102794]
```
    DMNBM_HELLFIRE,
```

Insertion in crawl-ref/source/beam.h at line 25 [15.4124541]

[14.102854]

};
enum mon_resist_type
{
    MON_RESIST,                 // monster resisted
    MON_UNAFFECTED,             // monster unaffected
    MON_AFFECTED,               // monster was affected
    MON_OTHER                   // monster unaffected, but for other reasons

Deletion in crawl-ref/source/beam.h at line 126 [15.4124541]

B:BD[14.106432] → [14.106432:106712]

B:BD[14.106712] → [62.11282:11347]

    bool        is_enchant;            // no block/dodge, but mag resist
    bool        is_energy;             // mostly energy/non-physical attack
    bool        is_launched;           // was fired from launcher?
    bool        is_thrown;             // was thrown from hand?
    bool        target_first;          // targeting by direction

Insertion in crawl-ref/source/beam.h at line 157 [15.4124541]
[14.108020]
[14.108020]
Insertion in crawl-ref/source/beam.h at line 164 [15.4124541]
[14.108211]
[14.108211]
```
    bool is_enchantment() const; // no block/dodge, but mag resist
```
Insertion in crawl-ref/source/beam.h at line 170 [15.4124541]
[14.108354]
[14.108444]
```
    actor* agent() const;
```
Deletion in crawl-ref/source/beam.h at line 175 [15.4124541]
B:BD[6.8561] → [6.8561:8562]
Deletion in crawl-ref/source/beam.h at line 176 [15.4124541]
∅:D[6.8632] → [14.108447:108448]
B:BD[14.108447] → [14.108447:108448]

Deletion in crawl-ref/source/beam.h at line 180 [15.4124541]

∅:D[63.389] → [15.4124876:4125082]

∅:D[64.14055] → [15.4124876:4125082]

B:BD[15.4124876] → [15.4124876:4125082]


/* ***********************************************************************
 * called from: bang - it_use2 - monstuff - mstuff2
 * *********************************************************************** */

Deletion in crawl-ref/source/beam.h at line 182 [15.4124541]

B:BD[15.4125412] → [15.4125412:4125698]

// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: ability - it_use3 - item_use - mstuff2 - religion -
 *              spells - spells4
 * *********************************************************************** */

Deletion in crawl-ref/source/beam.h at line 189 [15.4124541]

B:BD[15.4125771] → [15.4125771:4126000]

// last updated 22jan2001 {gdl}
/* ***********************************************************************
 * called from: effects - spells2 - spells4
 * *********************************************************************** */

Replacement in crawl-ref/source/beam.h at line 193 [15.4124541]

B:BD[15.4126148] → [15.4126148:4126410]

/* ***********************************************************************
 * called from: ability - item_use - spell
 * returns true if messages were generated during the enchantment
 * *********************************************************************** */

[15.4126148]

[65.538]

// returns true if messages were generated during the enchantment

Replacement in crawl-ref/source/beam.h at line 198 [15.4124541]

B:BD[15.4126471] → [15.4126471:4126667]

B:BD[15.4126667] → [66.6736:6795]

/* ***********************************************************************
 * called from: fight - monstuff - mstuff2
 * *********************************************************************** */
int mons_ench_f2( monsters *monster, struct bolt &pbolt );

[15.4126471]

[15.4126733]

mon_resist_type mons_ench_f2(monsters *monster, bolt &pbolt);

Deletion in crawl-ref/source/beam.h at line 201 [15.4124541]

B:BD[15.4126735] → [15.4126735:4126931]

/* ***********************************************************************
 * called from: fight - monstuff - spells2
 * *********************************************************************** */

Deletion in crawl-ref/source/beam.h at line 203 [15.4124541]
∅:D[67.5220] → [15.4127054:4127131]
∅:D[45.35378] → [15.4127054:4127131]
B:BD[15.4127054] → [15.4127054:4127131]
B:BD[15.4127573] → [15.4127573:4127676]
```
/* ***********************************************************************
 * called from: monstuff
 * *********************************************************************** */
```
Deletion in crawl-ref/source/beam.h at line 205 [15.4124541]
∅:D[68.10942] → [15.4127742:4127743]
∅:D[69.54111] → [15.4127742:4127743]
B:BD[15.4127742] → [15.4127742:4127743]
Deletion in crawl-ref/source/beam.h at line 206 [15.4124541]
∅:D[70.55026] → [15.4127743:4127922]
∅:D[34.1219895] → [15.4127743:4127922]
B:BD[15.4127743] → [15.4127743:4127922]
```
/* ***********************************************************************
 * called from: monstuff
 * *********************************************************************** */
```
Deletion in crawl-ref/source/beam.h at line 207 [15.4124541]
∅:D[66.6833] → [15.4127966:4127968]
B:BD[15.4127966] → [15.4127966:4127968]
Deletion in crawl-ref/source/beam.h at line 209 [15.4124541]
∅:D[71.710] → [15.4128027:4128028]
∅:D[72.12894] → [15.4128027:4128028]
∅:D[73.16488] → [15.4128027:4128028]
B:BD[15.4128027] → [15.4128027:4128028]
Deletion in crawl-ref/source/beam.h at line 211 [15.4124541]
B:BD[73.16593] → [73.16593:16594]
Deletion in crawl-ref/source/beam.h at line 213 [15.4124541]
∅:D[5.4061] → [74.2917:2918]
∅:D[62.11409] → [74.2917:2918]
∅:D[70.55094] → [74.2917:2918]
B:BD[74.2917] → [74.2917:2918]

Deletion in crawl-ref/source/beam.cc at line 64 [15.4128068]

B:BD[15.4129494] → [15.4129494:4129608]

B:BD[15.4129608] → [75.6325:6466]

#define MON_RESIST      0           // monster resisted
#define MON_UNAFFECTED  1           // monster unaffected
#define MON_AFFECTED    2           // monster was affected
#define MON_OTHER       3           // monster unaffected, but for other reasons

Replacement in crawl-ref/source/beam.cc at line 79 [15.4128068]
∅:D[62.11554] → [76.12142:12210]
B:BD[76.12142] → [76.12142:12210]
```
static int  _affect_monster_enchantment(bolt &beam, monsters *mon);
```
[62.11554]
[76.12210]
```
static mon_resist_type _affect_monster_enchantment(bolt &beam, monsters *mon);
```

Replacement in crawl-ref/source/beam.cc at line 92 [15.4128068]

B:BD[76.12694] → [76.12694:12754]

B:BD[76.12754] → [77.7414:7517]

static void _monster_die(monsters *mons, const bolt &beam);
static bool _nasty_beam(monsters *mon, bolt &beam);
static bool _nice_beam(monsters *mon, bolt &beam);

[76.12694]

[34.1220318]

static bool _nasty_beam(monsters *mon, const bolt &beam);
static bool _nice_beam(monsters *mon, const bolt &beam);

Deletion in crawl-ref/source/beam.cc at line 124 [15.4128068]
B:BD[34.1220679] → [76.12871:12930]
∅:D[76.12930] → [78.2856:2914]
B:BD[78.2856] → [78.2856:2914]
B:BD[78.2914] → [45.35460:35463]
```
static void _monster_die(monsters *mons, const bolt &beam)
{
    monster_die(mons, beam.killer(), beam.beam_source);
}
```
Replacement in crawl-ref/source/beam.cc at line 1505 [15.4128068]
B:BD[79.4153] → [79.4153:4178]
```
    if (pbolt.is_enchant
```
[79.4153]
[79.4178]
```
    if (pbolt.is_enchantment()
```

Replacement in crawl-ref/source/beam.cc at line 1731 [15.4128068]

B:BD[15.4177169] → [70.57182:57257]

        if (!pbolt.is_tracer && pbolt.name[0] != '0' && see_grid(testpos))

[15.4177169]

[15.4177246]

        if (!pbolt.is_tracer && !pbolt.is_enchantment() && see_grid(testpos))

Replacement in crawl-ref/source/beam.cc at line 1768 [15.4128068]
∅:D[80.8934] → [34.1230457:1230517]
B:BD[15.4178135] → [34.1230457:1230517]
```
                if (!pbolt.is_beam || pbolt.name[0] == '0')
```
[80.8934]
[4.3044]
```
                if (!pbolt.is_beam || pbolt.is_enchantment())
```
Replacement in crawl-ref/source/beam.cc at line 1803 [15.4128068]
B:BD[81.2831] → [82.3536:3566]
```
    if (pbolt.name[0] == '0')
```
[81.2831]
[15.4179225]
```
    if (pbolt.is_enchantment())
```
Replacement in crawl-ref/source/beam.cc at line 2276 [15.4128068]
∅:D[83.23960] → [84.2099:2148]
B:BD[15.4189897] → [84.2099:2148]
```
int mons_ench_f2(monsters *monster, bolt &pbolt)
```
[83.23960]
[15.4189960]
```
mon_resist_type mons_ench_f2(monsters *monster, bolt &pbolt)
```

Replacement in crawl-ref/source/beam.cc at line 2331 [15.4128068]

B:BD[85.7414] → [86.103731:103812]

            if (cast_healing(5 + roll_dice( pbolt.damage ), monster->pos()) > 0)

[85.7414]

[85.7570]

            if (cast_healing(5 + pbolt.damage.roll(), monster->pos()) > 0)

Replacement in crawl-ref/source/beam.cc at line 2335 [15.4128068]

B:BD[85.7719] → [85.7719:7799]

        else if (heal_monster( monster, 5 + roll_dice( pbolt.damage ), false ))

[85.7719]

[15.4191604]

        else if (heal_monster( monster, 5 + pbolt.damage.roll(), false ))

Replacement in crawl-ref/source/beam.cc at line 2436 [15.4128068]
B:BD[15.4195229] → [15.4195229:4195283]
```
}                               // end mons_ench_f2()
```
[15.4195229]
[15.4195283]
```
}
```
Deletion in crawl-ref/source/beam.cc at line 2502 [15.4128068]
∅:D[87.3375] → [34.1233660:1233686]
B:BD[34.1233660] → [34.1233660:1233686]
```
    bool mondied = false;
```
Replacement in crawl-ref/source/beam.cc at line 2516 [15.4128068]
∅:D[88.1296] → [34.1234036:1234103]
B:BD[34.1234036] → [34.1234036:1234103]
B:BD[34.1234103] → [76.14179:14224]
∅:D[78.4430] → [34.1234303:1234349]
∅:D[76.14224] → [34.1234303:1234349]
B:BD[34.1234303] → [34.1234303:1234349]
```
            if ((monster->hit_points -= hurted) < 1)
            {
                _monster_die(monster, beam);
                mondied = true;
            }
```
[88.1296]
[34.1234349]
```
            monster->hurt(beam.agent(), hurted, BEAM_POISON);
```
Replacement in crawl-ref/source/beam.cc at line 2519 [15.4128068]
B:BD[34.1234360] → [34.1234360:1234382]
```
        if (!mondied)
```
[34.1234360]
[76.14225]
```
        if (monster->alive())
```
Replacement in crawl-ref/source/beam.cc at line 2527 [15.4128068]
B:BD[34.1234536] → [34.1234536:1234558]
```
    return (mondied);
```
[34.1234536]
[34.1234558]
```
    return (!monster->alive());
```
Replacement in crawl-ref/source/beam.cc at line 2690 [15.4128068]
B:BD[15.4201443] → [34.1235800:1235829]
```
    if (beam.name[0] == '0')
```
[15.4201443]
[89.43962]
```
    if (beam.is_enchantment())
```
Replacement in crawl-ref/source/beam.cc at line 3180 [15.4128068]
B:BD[15.4215516] → [34.1240403:1240436]
```
        if (beam.name[0] == '0')
```
[15.4215516]
[15.4215554]
```
        if (beam.is_enchantment())
```
Replacement in crawl-ref/source/beam.cc at line 3424 [15.4128068]
B:BD[54.4695] → [54.4695:4724]
```
    if (beam.name[0] == '0')
```
[54.4695]
[54.4724]
```
    if (beam.is_enchantment())
```
Replacement in crawl-ref/source/beam.cc at line 3474 [15.4128068]
B:BD[54.5931] → [54.5931:5960]
```
    if (beam.name[0] == '0')
```
[54.5931]
[54.5960]
```
    if (beam.is_enchantment())
```
Replacement in crawl-ref/source/beam.cc at line 3577 [15.4128068]
B:BD[90.4661] → [91.15377:15406]
```
    if (beam.name[0] != '0')
```
[90.4661]
[15.4223779]
```
    if (!beam.is_enchantment())
```

Replacement in crawl-ref/source/beam.cc at line 3839 [15.4128068]

B:BD[15.4229565] → [92.8458:8512]

            _beam_ouch(roll_dice(beam.damage), beam);

[15.4229565]

[34.1244602]

            _beam_ouch(beam.damage.roll(), beam);

Replacement in crawl-ref/source/beam.cc at line 3865 [15.4128068]

B:BD[93.8283] → [92.8513:8567]

            _beam_ouch(roll_dice(beam.damage), beam);

[93.8283]

[34.1244685]

            _beam_ouch(beam.damage.roll(), beam);

Replacement in crawl-ref/source/beam.cc at line 3875 [15.4128068]

B:BD[15.4230248] → [92.8568:8622]

            _beam_ouch(roll_dice(beam.damage), beam);

[15.4230248]

[34.1244768]

            _beam_ouch(beam.damage.roll(), beam);

Replacement in crawl-ref/source/beam.cc at line 3935 [15.4128068]
∅:D[73.33465] → [91.15530:15570]
B:BD[15.4231099] → [91.15530:15570]
```
    hurted += roll_dice( beam.damage );
```
[73.33465]
[15.4231140]
```
    hurted += beam.damage.roll();
```
Replacement in crawl-ref/source/beam.cc at line 4213 [15.4128068]
∅:D[76.18516] → [34.1247510:1247539]
∅:D[94.26913] → [34.1247510:1247539]
B:BD[34.1247510] → [34.1247510:1247539]
B:BD[34.1247539] → [76.18517:18550]
```
        mon->hit_points = 0;
        _monster_die(mon, beam);
```
[76.18516]
[34.1247592]
```
        mon->hurt(beam.agent(), INSTANT_DEATH);
```
Replacement in crawl-ref/source/beam.cc at line 4218 [15.4128068]
B:BD[95.1488] → [77.10492:10537]
```
    if (beam.name[0] == '0') // enchantments
```
[95.1488]
[15.4234246]
```
    if (beam.is_enchantment()) // enchantments: no to-hit check
```

Deletion in crawl-ref/source/beam.cc at line 4280 [15.4128068]

∅:D[96.4437] → [97.3162:3163]

B:BD[97.3162] → [97.3162:3163]

∅:D[97.3163] → [15.4235345:4235514]

B:BD[15.4235345] → [15.4235345:4235514]

B:BD[15.4235514] → [76.18733:18783]


        // !@#*( affect_monster_enchantment() has side-effects on
        // the beam structure which screw up range_used_on_hit(),
        // so call it now and store.
        int rangeUsed = _range_used_on_hit(beam);

Replacement in crawl-ref/source/beam.cc at line 4286 [15.4128068]

B:BD[15.4235601] → [76.18831:18897]

        int ench_result = _affect_monster_enchantment(beam, mon);

[15.4235601]

[98.367]

        mon_resist_type ench_result = _affect_monster_enchantment(beam, mon);

Insertion in crawl-ref/source/beam.cc at line 4289 [15.4128068]

[15.4235704]

[98.394]

            if (mons_is_mimic(mon->type))
                mimic_alert(mon);

Replacement in crawl-ref/source/beam.cc at line 4310 [15.4128068]
∅:D[95.1875] → [15.4236088:4236116]
∅:D[62.38125] → [15.4236088:4236116]
B:BD[15.4236088] → [15.4236088:4236116]
```
        return (rangeUsed);
```
[62.38125]
[15.4236116]
```
        return (_range_used_on_hit(beam));
```
Replacement in crawl-ref/source/beam.cc at line 4324 [15.4128068]
B:BD[15.4236476] → [15.4236476:4236513]
```
    hurt = roll_dice( beam.damage );
```
[15.4236476]
[15.4236513]
```
    hurt = beam.damage.roll();
```
Replacement in crawl-ref/source/beam.cc at line 4556 [15.4128068]
∅:D[99.5245] → [15.4240973:4241010]
B:BD[15.4240973] → [15.4240973:4241010]
```
    hurt_monster( mon, hurt_final );
```
[99.5245]
[91.15726]
```
    mon->hurt(beam.agent(), hurt_final, beam.flavour);
```
Replacement in crawl-ref/source/beam.cc at line 4558 [15.4128068]
∅:D[100.9402] → [15.4241092:4241127]
∅:D[91.15727] → [15.4241092:4241127]
B:BD[15.4241092] → [15.4241092:4241127]
B:BD[15.4241127] → [76.19147:19180]
∅:D[78.4496] → [15.4241180:4241195]
∅:D[76.19180] → [15.4241180:4241195]
B:BD[15.4241180] → [15.4241180:4241195]
```
    if (mon->hit_points < 1)
    {
        _monster_die(mon, beam);
    }
    else
```
[91.15727]
[15.4241195]
```
    if (mon->alive())
```

Replacement in crawl-ref/source/beam.cc at line 4561 [15.4128068]

B:BD[15.4241260] → [19.5593:5715]

        {
            const monsters *mons = static_cast<const monsters*>(mon);
            print_wounds(mons);
        }

[15.4241260]

[15.4241291]

            print_wounds(mon);

Replacement in crawl-ref/source/beam.cc at line 4633 [15.4128068]
B:BD[15.4242331] → [76.19512:19578]
```
static int _affect_monster_enchantment(bolt &beam, monsters *mon)
```
[15.4242331]
[15.4242410]
```
bool _beam_has_saving_throw(const bolt& beam)
```
Replacement in crawl-ref/source/beam.cc at line 4635 [15.4128068]
B:BD[15.4242412] → [101.10912:10942]
```
    bool death_check = false;
```
[15.4242412]
[101.10942]
```
    if (beam.aimed_at_feet)
        return (false);
```
Replacement in crawl-ref/source/beam.cc at line 4638 [15.4128068]
∅:D[101.10943] → [15.4242412:4242468]
B:BD[15.4242412] → [15.4242412:4242468]
```
    if (beam.flavour == BEAM_TELEPORT) // teleportation
```
[101.10943]
[15.4242468]
```
    bool rc = true;
    switch (beam.flavour)
```

Replacement in crawl-ref/source/beam.cc at line 4642 [15.4128068]

B:BD[15.4242474] → [15.4242474:4242534]

B:BD[15.4242534] → [34.1250846:1250882]

∅:D[34.1250882] → [15.4242568:4242578]

B:BD[15.4242568] → [15.4242568:4242578]

B:BD[15.4242578] → [80.9471:9546]

∅:D[102.1844] → [15.4242611:4242621]

∅:D[80.9546] → [15.4242611:4242621]

B:BD[15.4242611] → [15.4242611:4242621]

        if (check_mons_resist_magic( mon, beam.ench_power )
            && !beam.aimed_at_feet)
        {
            return (mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST);
        }

[15.4242474]

[15.4242621]

    case BEAM_HASTE:
    case BEAM_HEALING:
    case BEAM_INVISIBILITY:
    case BEAM_DISPEL_UNDEAD:
    case BEAM_ENSLAVE_DEMON:    // it has a different saving throw
        rc = false;
        break;
    default:
        break;
    }
    return rc;
}

Replacement in crawl-ref/source/beam.cc at line 4655 [15.4128068]

B:BD[15.4242622] → [103.1331:1390]

∅:D[103.1390] → [34.1250883:1250923]

B:BD[15.4242692] → [34.1250883:1250923]

        if (mons_near(mon) && player_monster_visible(mon))
            beam.obvious_effect = true;

[15.4242622]

[15.4242731]

bool _ench_flavour_affects_monster(beam_type flavour, const monsters* mon)
{
    bool rc = true;
    switch (flavour)
    {
    case BEAM_POLYMORPH:
        rc = mon->can_mutate();
        break;

Replacement in crawl-ref/source/beam.cc at line 4664 [15.4128068]

B:BD[15.4242732] → [15.4242732:4242770]

        monster_teleport(mon, false);

[15.4242732]

[34.1250924]

    case BEAM_DEGENERATE:
        rc = (mons_holiness(mon) == MH_NATURAL
              && mon->type != MONS_PULSATING_LUMP);
        break;

Replacement in crawl-ref/source/beam.cc at line 4669 [15.4128068]

B:BD[34.1250925] → [34.1250925:1250962]

        return (MON_AFFECTED);
    }

[34.1250925]

[34.1250962]

    case BEAM_ENSLAVE_UNDEAD:
        rc = (mons_holiness(mon) == MH_UNDEAD && mon->attitude != ATT_FRIENDLY);
        break;

Replacement in crawl-ref/source/beam.cc at line 4673 [15.4128068]

B:BD[34.1250963] → [34.1250963:1251111]

B:BD[34.1251111] → [102.1845:1918]

∅:D[102.1918] → [34.1251144:1251154]

B:BD[34.1251144] → [34.1251144:1251154]

    if (beam.flavour == BEAM_BLINK)
    {
        if (!beam.aimed_at_feet
            && check_mons_resist_magic( mon, beam.ench_power ))
        {
            return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;
        }

[34.1250963]

[15.4242770]

    case BEAM_DISPEL_UNDEAD:
        rc = (mons_holiness(mon) == MH_UNDEAD);
        break;

Replacement in crawl-ref/source/beam.cc at line 4677 [15.4128068]

B:BD[15.4242771] → [34.1251155:1251258]

        if (mons_near( mon ) && player_monster_visible( mon ))
            beam.obvious_effect = true;

[15.4242771]

[34.1251258]

    case BEAM_ENSLAVE_DEMON:
        rc = (mons_holiness(mon) == MH_DEMONIC && !mons_friendly(mon));
        break;

Replacement in crawl-ref/source/beam.cc at line 4681 [15.4128068]

B:BD[34.1251259] → [34.1251259:1251289]

∅:D[34.1251289] → [15.4242771:4242802]

B:BD[15.4242771] → [15.4242771:4242802]

        monster_blink( mon );
        return (MON_AFFECTED);

[34.1251259]

[15.4242802]

    case BEAM_PAIN:
        rc = !mons_res_negative_energy(mon);
        break;
    case BEAM_SLEEP:
        rc = !mon->has_ench(ENCH_SLEEP_WARY)     // slept recently
            && mons_holiness(mon) == MH_NATURAL  // no unnatural
            && mons_res_cold(mon) <= 0;          // can't be hibernated
        break;
    default:
        break;

Insertion in crawl-ref/source/beam.cc at line 4694 [15.4128068]
[15.4242808]
[15.4242808]
```
    
    return rc;
}
```

Replacement in crawl-ref/source/beam.cc at line 4698 [15.4128068]

B:BD[15.4242809] → [15.4242809:4242849]

    if (beam.flavour == BEAM_POLYMORPH)

[15.4242809]

[15.4242849]

static mon_resist_type _affect_monster_enchantment(bolt &beam, monsters *mon)
{
    // Early out if the enchantment is meaningless.
    if (!_ench_flavour_affects_monster(beam.flavour, mon))
        return (MON_UNAFFECTED);
    // Check magic resistance.
    if (_beam_has_saving_throw(beam))

Replacement in crawl-ref/source/beam.cc at line 4707 [15.4128068]
B:BD[15.4242855] → [104.3062:3094]
```
        if (!mon->can_mutate())
```
[15.4242855]
[15.4242909]
```
        if (mons_immune_magic(mon))
```

Insertion in crawl-ref/source/beam.cc at line 4709 [15.4128068]

[15.4242946]

        if (check_mons_resist_magic(mon, beam.ench_power))
            return (MON_RESIST);
    }

Replacement in crawl-ref/source/beam.cc at line 4713 [15.4128068]

B:BD[15.4242947] → [15.4242947:4243008]

B:BD[15.4243008] → [77.12273:12348]

∅:D[102.1992] → [15.4243041:4243042]

∅:D[77.12348] → [15.4243041:4243042]

B:BD[15.4243041] → [15.4243041:4243042]

        if (check_mons_resist_magic( mon, beam.ench_power ))
            return (mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST);

[15.4242947]

[104.3095]

    switch (beam.flavour)
    {
    case BEAM_TELEPORT:
        if (you.can_see(mon))
            beam.obvious_effect = true;
        monster_teleport(mon, false);
        return (MON_AFFECTED);
        
    case BEAM_BLINK:
        if (you.can_see(mon))
            beam.obvious_effect = true;
        monster_blink(mon);
        return (MON_AFFECTED);
        
    case BEAM_POLYMORPH:

Deletion in crawl-ref/source/beam.cc at line 4730 [15.4128068]
∅:D[34.1251379] → [15.4243138:4243139]
B:BD[15.4243138] → [15.4243138:4243139]
Deletion in crawl-ref/source/beam.cc at line 4735 [15.4128068]
∅:D[105.6899] → [106.2954:2955]
B:BD[106.2954] → [106.2954:2955]

Deletion in crawl-ref/source/beam.cc at line 4736 [15.4128068]

B:BD[15.4243170] → [15.4243170:4243281]

B:BD[15.4243281] → [102.1993:2066]

    }
    if (beam.flavour == BEAM_BANISH)
    {
        if (check_mons_resist_magic( mon, beam.ench_power ))
            return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;

Insertion in crawl-ref/source/beam.cc at line 4737 [15.4128068]
[15.4243315]
[15.4243315]
```
    case BEAM_BANISH:
```
Replacement in crawl-ref/source/beam.cc at line 4741 [15.4128068]
B:BD[15.4243458] → [76.19579:19616]
∅:D[78.4533] → [15.4243518:4243519]
∅:D[76.19616] → [15.4243518:4243519]
B:BD[15.4243518] → [15.4243518:4243519]
```
            _monster_die(mon, beam);
```
[15.4243458]
[34.1251380]
```
            mon->banish();
```

Deletion in crawl-ref/source/beam.cc at line 4744 [15.4128068]

B:BD[15.4243585] → [15.4243585:4243639]

B:BD[15.4243639] → [34.1251417:1251462]

∅:D[34.1251462] → [15.4243690:4243858]

B:BD[15.4243690] → [15.4243690:4243858]

B:BD[15.4243858] → [102.2067:2140]

    }
    if (beam.flavour == BEAM_DEGENERATE)
    {
        if (mons_holiness(mon) != MH_NATURAL
            || mon->type == MONS_PULSATING_LUMP)
        {
            return (MON_UNAFFECTED);
        }
        if (check_mons_resist_magic( mon, beam.ench_power ))
            return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;

Insertion in crawl-ref/source/beam.cc at line 4745 [15.4128068]
[15.4243892]
[107.56275]
```
    case BEAM_DEGENERATE:
```
Deletion in crawl-ref/source/beam.cc at line 4748 [15.4128068]
∅:D[34.1251503] → [15.4243993:4243994]
B:BD[15.4243993] → [15.4243993:4243994]
Deletion in crawl-ref/source/beam.cc at line 4749 [15.4128068]
B:BD[15.4244025] → [15.4244025:4244082]
B:BD[15.4244082] → [34.1251504:1251549]
∅:D[34.1251549] → [15.4244133:4244170]
B:BD[15.4244133] → [15.4244133:4244170]
```
    }
    if (beam.flavour == BEAM_DISPEL_UNDEAD)
    {
        if (mons_holiness(mon) != MH_UNDEAD)
            return (MON_UNAFFECTED);
```
Insertion in crawl-ref/source/beam.cc at line 4750 [15.4128068]
[15.4244171]
[15.4244171]
```
    case BEAM_DISPEL_UNDEAD:
```
Replacement in crawl-ref/source/beam.cc at line 4753 [15.4128068]
∅:D[34.1251590] → [15.4244266:4244323]
B:BD[15.4244266] → [15.4244266:4244323]
B:BD[15.4244323] → [101.10944:10972]
∅:D[101.10972] → [15.4244348:4244354]
B:BD[15.4244348] → [15.4244348:4244354]
```
        hurt_monster( mon, roll_dice( beam.damage ) );
        death_check = true;
    }
```
[34.1251590]
[15.4244354]
```
        mon->hurt(beam.agent(), beam.damage.roll());
        return (MON_AFFECTED);
```
Replacement in crawl-ref/source/beam.cc at line 4756 [15.4128068]
B:BD[15.4244355] → [108.5952:5996]
∅:D[108.5996] → [34.1251591:1251635]
B:BD[15.4244400] → [34.1251591:1251635]
```
    if (beam.flavour == BEAM_ENSLAVE_UNDEAD
        && mons_holiness(mon) == MH_UNDEAD)
```
[15.4244355]
[15.4244450]
```
    case BEAM_ENSLAVE_UNDEAD:
```
Deletion in crawl-ref/source/beam.cc at line 4766 [15.4128068]
B:BD[15.4244633] → [109.1481:1562]
∅:D[109.1562] → [15.4244633:4244634]
B:BD[15.4244633] → [15.4244633:4244634]
B:BD[15.4244634] → [12.3021:3080]
∅:D[12.3080] → [102.2141:2214]
B:BD[15.4244695] → [102.2141:2214]
```
        if (mon->attitude == ATT_FRIENDLY)
            return (MON_UNAFFECTED);
        if (check_mons_resist_magic(mon, beam.ench_power))
            return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;
```
Replacement in crawl-ref/source/beam.cc at line 4785 [15.4128068]
B:BD[15.4244931] → [110.2988:3031]
∅:D[110.3031] → [34.1251673:1251718]
B:BD[15.4244975] → [34.1251673:1251718]
∅:D[34.1251718] → [15.4245026:4245032]
B:BD[15.4245026] → [15.4245026:4245032]
```
    if (beam.flavour == BEAM_ENSLAVE_DEMON
        && mons_holiness(mon) == MH_DEMONIC)
    {
```
[15.4244931]
[15.4245032]
```
    case BEAM_ENSLAVE_DEMON:
```
Deletion in crawl-ref/source/beam.cc at line 4796 [15.4128068]
∅:D[111.397] → [15.4245302:4245303]
B:BD[15.4245302] → [15.4245302:4245303]
B:BD[15.4245303] → [112.10875:10904]
∅:D[112.10904] → [113.435:467]
B:BD[109.1591] → [113.435:467]
∅:D[113.467] → [109.1634:1671]
B:BD[109.1634] → [109.1634:1671]
```
        // Already friendly.
        if (mons_friendly(mon))
            return (MON_UNAFFECTED);
```
Replacement in crawl-ref/source/beam.cc at line 4806 [15.4128068]
B:BD[15.4245393] → [99.5607:5644]
```
        // Wow, permanent enslaving!
```
[15.4245393]
[113.468]
```
        // Wow, permanent enslaving! (sometimes)
```
Deletion in crawl-ref/source/beam.cc at line 4812 [15.4128068]
∅:D[12.3220] → [114.3349:3350]
B:BD[113.612] → [114.3349:3350]

Deletion in crawl-ref/source/beam.cc at line 4813 [15.4128068]

B:BD[15.4245498] → [15.4245498:4245512]

B:BD[15.4245512] → [114.3351:3423]

∅:D[114.3423] → [15.4245585:4245702]

B:BD[15.4245585] → [15.4245585:4245702]

B:BD[15.4245702] → [115.367:586]

B:BD[115.586] → [91.15728:15766]

∅:D[91.15766] → [15.4245797:4245889]

B:BD[15.4245797] → [15.4245797:4245889]

B:BD[15.4245889] → [102.2215:2284]

∅:D[102.2284] → [15.4245918:4246070]

B:BD[15.4245918] → [15.4245918:4246070]

    }
    //
    // Everything past this point must pass this magic resistance test.
    //
    // Using check_mons_resist_magic here since things like disintegrate
    // are beyond this point. -- bwr
    // death_check should be set true already if one of the beams above
    // did its thing but wants to see if the monster died.
    //
    if (!death_check
        && check_mons_resist_magic( mon, beam.ench_power )
        && beam.flavour != BEAM_HASTE
        && beam.flavour != BEAM_HEALING
        && beam.flavour != BEAM_INVISIBILITY)
    {
        return mons_immune_magic(mon) ? MON_UNAFFECTED : MON_RESIST;
    }
    if (beam.flavour == BEAM_PAIN)      /* pain/agony */
    {
        if (mons_res_negative_energy( mon ))
            return (MON_UNAFFECTED);

Insertion in crawl-ref/source/beam.cc at line 4814 [15.4128068]
[15.4246071]
[15.4246071]
```
    case BEAM_PAIN:             // pain/agony
```

Deletion in crawl-ref/source/beam.cc at line 4817 [15.4128068]

∅:D[34.1251796] → [15.4246175:4246176]

B:BD[15.4246175] → [15.4246175:4246176]

B:BD[15.4246176] → [34.1251797:1251855]

∅:D[34.1251855] → [15.4246231:4246510]

B:BD[15.4246231] → [15.4246231:4246510]


        if (beam.name.find("agony") != std::string::npos)
        {
            // AGONY
            mon->hit_points = mon->hit_points / 2;
            if (mon->hit_points < 1)
                mon->hit_points = 1;
        }
        else
        {
            // PAIN
            hurt_monster( mon, roll_dice( beam.damage ) );
        }

Replacement in crawl-ref/source/beam.cc at line 4818 [15.4128068]

B:BD[15.4246511] → [101.10973:11001]

∅:D[101.11001] → [15.4246536:4246542]

B:BD[15.4246536] → [15.4246536:4246542]

        death_check = true;
    }

[15.4246511]

[15.4246542]

        if (beam.name.find("agony") != std::string::npos) // agony
            mon->hit_points = std::max(mon->hit_points/2, 1);
        else                    // pain
            mon->hurt(beam.agent(), beam.damage.roll(), beam.flavour);
        return (MON_AFFECTED);

Replacement in crawl-ref/source/beam.cc at line 4824 [15.4128068]

B:BD[15.4246543] → [15.4246543:4246625]

    if (beam.flavour == BEAM_DISINTEGRATION)     /* disrupt/disintegrate */
    {

[15.4246543]

[15.4246625]

    case BEAM_DISINTEGRATION:   // disrupt/disintegrate

Replacement in crawl-ref/source/beam.cc at line 4827 [15.4128068]

∅:D[34.1251896] → [15.4246721:4246778]

B:BD[15.4246721] → [15.4246721:4246778]

B:BD[15.4246778] → [101.11002:11030]

∅:D[101.11030] → [15.4246803:4246853]

B:BD[15.4246803] → [15.4246803:4246853]

B:BD[15.4246853] → [45.38249:38312]

B:BD[45.38312] → [91.15767:15800]

∅:D[91.15800] → [15.4246964:4246965]

B:BD[15.4246964] → [15.4246964:4246965]

B:BD[15.4246965] → [91.15801:15863]

∅:D[91.15863] → [116.634:802]

B:BD[34.1251960] → [116.634:802]

∅:D[116.802] → [15.4247034:4247072]

∅:D[34.1251960] → [15.4247034:4247072]

B:BD[15.4247034] → [15.4247034:4247072]


        hurt_monster( mon, roll_dice( beam.damage ) );
        death_check = true;
    }
    if (beam.flavour == BEAM_SLEEP)
    {
        if (mon->has_ench(ENCH_SLEEP_WARY))  // slept recently
            return (MON_RESIST);
        if (mons_holiness(mon) != MH_NATURAL) // no unnatural
            return (MON_UNAFFECTED);
        // Cold res monsters resist hibernation (for consistency
        // with mass sleep).
        if (mons_res_cold(mon) > 0)
            return (MON_UNAFFECTED);

[34.1251896]

[15.4247072]

        mon->hurt(beam.agent(), beam.damage.roll(), beam.flavour);
        return (MON_AFFECTED);
        
    case BEAM_SLEEP:

Deletion in crawl-ref/source/beam.cc at line 4833 [15.4128068]
∅:D[34.1252001] → [15.4247172:4247173]
B:BD[15.4247172] → [15.4247172:4247173]
Deletion in crawl-ref/source/beam.cc at line 4834 [15.4128068]
∅:D[117.872] → [15.4247256:4247257]
∅:D[45.38353] → [15.4247256:4247257]
B:BD[15.4247256] → [15.4247256:4247257]
Deletion in crawl-ref/source/beam.cc at line 4835 [15.4128068]
B:BD[15.4247288] → [15.4247288:4247294]
```
    }
```
Replacement in crawl-ref/source/beam.cc at line 4836 [15.4128068]
B:BD[15.4247295] → [15.4247295:4247341]
```
    if (beam.flavour == BEAM_BACKLIGHT)
    {
```
[15.4247295]
[56.14779]
```
    case BEAM_BACKLIGHT:
```
Deletion in crawl-ref/source/beam.cc at line 4843 [15.4128068]
B:BD[15.4247529] → [15.4247529:4247535]
```
    }
```
Replacement in crawl-ref/source/beam.cc at line 4844 [15.4128068]
B:BD[15.4247536] → [112.10905:10929]
∅:D[112.10929] → [77.12349:12371]
B:BD[15.4247560] → [77.12349:12371]
```
    // Everything else?
    if (!death_check)
```
[15.4247536]
[101.11055]
```
    default:
```
Deletion in crawl-ref/source/beam.cc at line 4846 [15.4128068]
∅:D[101.11097] → [15.4247716:4247746]
B:BD[15.4247716] → [15.4247716:4247746]
B:BD[15.4247746] → [76.19617:19650]
∅:D[78.4566] → [15.4247799:4247912]
∅:D[76.19650] → [15.4247799:4247912]
B:BD[15.4247799] → [15.4247799:4247912]
```
    if (mon->hit_points < 1)
        _monster_die(mon, beam);
    else
    {
        print_wounds(mon);
        if (mons_is_mimic( mon->type ))
            mimic_alert(mon);
```
Deletion in crawl-ref/source/beam.cc at line 4847 [15.4128068]
B:BD[15.4247918] → [15.4247918:4247946]
```
    return (MON_AFFECTED);
```
Replacement in crawl-ref/source/beam.cc at line 4858 [15.4128068]
B:BD[15.4248165] → [34.1252067:1252096]
```
    if (beam.name[0] == '0')
```
[15.4248165]
[15.4248199]
```
    if (beam.is_enchantment())
```
Replacement in crawl-ref/source/beam.cc at line 5374 [15.4128068]
B:BD[15.4259354] → [77.12372:12423]
```
static bool _nasty_beam(monsters *mon, bolt &beam)
```
[15.4259354]
[15.4259411]
```
static bool _nasty_beam(monsters *mon, const bolt &beam)
```
Replacement in crawl-ref/source/beam.cc at line 5377 [15.4128068]
∅:D[112.11074] → [34.1253529:1253558]
B:BD[15.4259450] → [34.1253529:1253558]
```
    if (beam.name[0] != '0')
```
[112.11074]
[15.4259484]
```
    if (!beam.is_enchantment())
```
Replacement in crawl-ref/source/beam.cc at line 5416 [15.4128068]
B:BD[94.27008] → [77.12424:12474]
```
static bool _nice_beam(monsters *mon, bolt &beam)
```
[94.27008]
[94.27066]
```
static bool _nice_beam(monsters *mon, const bolt &beam)
```

Replacement in crawl-ref/source/beam.cc at line 5443 [15.4128068]

B:BD[34.1254543] → [34.1254543:1254691]

               is_enchant(false), is_energy(false), is_launched(false),
               is_thrown(false), target_first(false), aimed_at_spot(false),

[34.1254543]

[118.1102]

//               is_launched(false),
               aimed_at_spot(false),

Insertion in crawl-ref/source/beam.cc at line 5504 [15.4128068]

[91.16021]

[15.4260380]

}
actor* bolt::agent() const
{
    if (YOU_KILL(this->thrower))
        return (&you);
    else if (this->beam_source != NON_MONSTER)
        return (&menv[this->beam_source]);
    else
        return (NULL);
}
bool bolt::is_enchantment() const
{
    return (this->flavour >= BEAM_FIRST_ENCHANTMENT
            && this->flavour <= BEAM_LAST_ENCHANTMENT);

Redid monster death idiom so that monsters::hurt can implicitly

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/traps.cc at line 474 [14.5308]

Replacement in crawl-ref/source/traps.cc at line 1206 [14.5308]

Deletion in crawl-ref/source/stuff.h at line 43 [15.217090]

Deletion in crawl-ref/source/stuff.h at line 45 [15.217090]

Deletion in crawl-ref/source/stuff.cc at line 651 [15.224557]

Insertion in crawl-ref/source/stuff.cc at line 1671 [15.224557]

Replacement in crawl-ref/source/spl-cast.cc at line 2578 [15.293070]

Insertion in crawl-ref/source/spells4.cc at line 77 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 81 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 86 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 175 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 587 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 1737 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 1761 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 1774 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 1783 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 1796 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 1818 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 1833 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 1850 [15.436250]

Replacement in crawl-ref/source/spells4.cc at line 2232 [15.436250]

Replacement in crawl-ref/source/spells3.cc at line 224 [15.531613]

Deletion in crawl-ref/source/spells3.cc at line 277 [15.531613]

Replacement in crawl-ref/source/spells3.cc at line 278 [15.531613]

Replacement in crawl-ref/source/spells2.cc at line 643 [15.569242]

Replacement in crawl-ref/source/spells2.cc at line 697 [15.569242]

Replacement in crawl-ref/source/spells2.cc at line 700 [15.569242]

Insertion in crawl-ref/source/spells2.cc at line 706 [15.569242]

Deletion in crawl-ref/source/spells2.cc at line 747 [15.569242]

Replacement in crawl-ref/source/spells2.cc at line 749 [15.569242]

Deletion in crawl-ref/source/spells2.cc at line 807 [15.569242]

Replacement in crawl-ref/source/spells2.cc at line 810 [15.569242]

Replacement in crawl-ref/source/spells2.cc at line 812 [15.569242]

Replacement in crawl-ref/source/player.cc at line 6453 [15.962854]

Insertion in crawl-ref/source/player.cc at line 6456 [15.962854]

Replacement in crawl-ref/source/ouch.cc at line 807 [15.1104358]

Replacement in crawl-ref/source/ouch.cc at line 809 [15.1104358]

Deletion in crawl-ref/source/mstuff2.cc at line 1822 [15.1340842]

Replacement in crawl-ref/source/monstuff.h at line 186 [15.1390580]

Replacement in crawl-ref/source/monstuff.cc at line 1971 [15.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 1973 [15.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 7394 [15.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 7401 [15.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 4954 [15.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4957 [15.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4968 [15.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4970 [15.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6144 [15.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 6155 [15.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6170 [15.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6182 [15.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 6187 [15.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 6188 [15.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 6196 [15.1699344]

Deletion in crawl-ref/source/items.cc at line 367 [15.2584728]

Replacement in crawl-ref/source/fight.cc at line 1192 [15.3140790]

Deletion in crawl-ref/source/fight.cc at line 1224 [15.3140790]

Deletion in crawl-ref/source/fight.cc at line 1225 [15.3140790]

Replacement in crawl-ref/source/fight.cc at line 1226 [15.3140790]

Replacement in crawl-ref/source/fight.cc at line 1722 [15.3140790]

Deletion in crawl-ref/source/fight.cc at line 1852 [15.3140790]

Replacement in crawl-ref/source/fight.cc at line 1853 [15.3140790]

Replacement in crawl-ref/source/fight.cc at line 1855 [15.3140790]

Replacement in crawl-ref/source/externs.h at line 306 [15.3270163]

Insertion in crawl-ref/source/externs.h at line 408 [15.3270163]

Replacement in crawl-ref/source/externs.h at line 897 [15.3270163]

Replacement in crawl-ref/source/externs.h at line 1298 [15.3270163]

Replacement in crawl-ref/source/enum.h at line 178 [15.3287960]

Replacement in crawl-ref/source/enum.h at line 184 [15.3287960]

Replacement in crawl-ref/source/enum.h at line 189 [15.3287960]

Replacement in crawl-ref/source/enum.h at line 195 [15.3287960]

Replacement in crawl-ref/source/enum.h at line 198 [15.3287960]

Replacement in crawl-ref/source/enum.h at line 200 [15.3287960]

Replacement in crawl-ref/source/enum.h at line 207 [15.3287960]

Insertion in crawl-ref/source/enum.h at line 228 [15.3287960]

Replacement in crawl-ref/source/enum.h at line 231 [15.3287960]