fiddlerwoaroof/crawl - Change XGPPA2X3G3266EVSTXGQ7ZWYOCJ32FEYPEUJV55AI5TGFYHTYTQQC

Expand the setting of spell_type in mgen_data to include all

monster-creating spells, and avoid assertion failures caused by setting an abjuration duration of 0 and a spell_type to something other than 0.

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

Created by dolorous on January 3, 2009

XGPPA2X3G3266EVSTXGQ7ZWYOCJ32FEYPEUJV55AI5TGFYHTYTQQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1546 [11.293070]

B:BD[9.337] → [10.267:322]

        summon_holy_being_type(MONS_ANGEL, powc, god);

[9.337]

[12.256]

        summon_holy_being_type(MONS_ANGEL, powc, god, (int)spell);

Replacement in crawl-ref/source/spl-cast.cc at line 1550 [11.293070]

B:BD[13.340] → [10.323:378]

        summon_holy_being_type(MONS_DAEVA, powc, god);

[13.340]

[14.161]

        summon_holy_being_type(MONS_DAEVA, powc, god, (int)spell);

Replacement in crawl-ref/source/spl-cast.cc at line 2884 [11.293070]

B:BD[15.25285] → [16.667:969]

    // If data.abjuration_duration == 0 then data.summon_type will simply
    // be ignored.
    if (you.penance[god] > 0)
        data.summon_type = MON_SUMM_WRATH;
    else if (source == ZOT_TRAP_MISCAST)
        data.summon_type = MON_SUMM_ZOT;
    else
        data.summon_type = MON_SUMM_MISCAST;

[15.25285]

[16.969]

    // If data.abjuration_duration == 0, then data.summon_type will
    // simply be ignored.
    if (data.abjuration_duration != 0)
    {
        if (you.penance[god] > 0)
            data.summon_type = MON_SUMM_WRATH;
        else if (source == ZOT_TRAP_MISCAST)
            data.summon_type = MON_SUMM_ZOT;
        else
            data.summon_type = MON_SUMM_MISCAST;
    }

Replacement in crawl-ref/source/spells3.h at line 113 [11.526814]

B:BD[17.3032] → [17.3032:3093]

bool summon_lesser_demon(int pow, god_type god = GOD_NO_GOD,

[17.3032]

[17.3093]

bool summon_lesser_demon(int pow, god_type god = GOD_NO_GOD, int spell = 0,

Replacement in crawl-ref/source/spells3.h at line 115 [11.526814]

B:BD[17.3139] → [17.3139:3200]

bool summon_common_demon(int pow, god_type god = GOD_NO_GOD,

[17.3139]

[17.3200]

bool summon_common_demon(int pow, god_type god = GOD_NO_GOD, int spell = 0,

Replacement in crawl-ref/source/spells3.h at line 117 [11.526814]

B:BD[17.3246] → [17.3246:3308]

bool summon_greater_demon(int pow, god_type god = GOD_NO_GOD,

[17.3246]

[17.3308]

bool summon_greater_demon(int pow, god_type god = GOD_NO_GOD, int spell = 0,

Replacement in crawl-ref/source/spells3.h at line 119 [11.526814]

B:BD[17.3355] → [17.3355:3433]

bool summon_demon_type(monster_type mon, int pow, god_type god = GOD_NO_GOD);

[17.3355]

[17.3433]

bool summon_demon_type(monster_type mon, int pow, god_type god = GOD_NO_GOD,
                       int spell = 0);

Replacement in crawl-ref/source/spells3.cc at line 409 [11.531613]

∅:D[18.215] → [19.1257:1352]

B:BD[19.1257] → [19.1257:1352]

            mgen_data(mon, BEH_FRIENDLY, dur, you.pos(),
                      you.pet_target,

[18.215]

[17.4178]

            mgen_data(mon, BEH_FRIENDLY,
                      dur, SPELL_CALL_IMP,
                      you.pos(), you.pet_target,

Replacement in crawl-ref/source/spells3.cc at line 430 [11.531613]

B:BD[19.1801] → [17.4222:4297]

∅:D[17.4297] → [20.447:565]

B:BD[18.435] → [20.447:565]

static bool _summon_demon_wrapper(int pow, god_type god, monster_type mon,
                                  int dur, bool friendly, bool charmed,
                                  bool quiet)

[19.1801]

[19.2005]

static bool _summon_demon_wrapper(int pow, god_type god, int spell,
                                  monster_type mon, int dur, bool friendly,
                                  bool charmed, bool quiet)

Replacement in crawl-ref/source/spells3.cc at line 441 [11.531613]

B:BD[19.2288] → [19.2288:2326]

                      dur, you.pos(),

[19.2288]

[19.2326]

                      dur, spell,
                      you.pos(),

Replacement in crawl-ref/source/spells3.cc at line 462 [11.531613]

B:BD[18.898] → [17.4342:4421]

∅:D[17.4421] → [20.566:684]

B:BD[18.978] → [20.566:684]

static bool _summon_demon_wrapper(int pow, god_type god, demon_class_type dct,
                                  int dur, bool friendly, bool charmed,
                                  bool quiet)

[18.898]

[18.1050]

static bool _summon_demon_wrapper(int pow, god_type god, int spell,
                                  demon_class_type dct, int dur, bool friendly,
                                  bool charmed, bool quiet)

Replacement in crawl-ref/source/spells3.cc at line 468 [11.531613]

B:BD[18.1099] → [17.4422:4502]

    return _summon_demon_wrapper(pow, god, mon, dur, friendly, charmed, quiet);

[18.1099]

[19.2694]

    return _summon_demon_wrapper(pow, god, spell, mon, dur, friendly, charmed,
                                 quiet);

Replacement in crawl-ref/source/spells3.cc at line 472 [11.531613]
B:BD[19.2697] → [17.4503:4551]
```
bool summon_lesser_demon(int pow, god_type god,
```
[19.2697]
[17.4551]
```
bool summon_lesser_demon(int pow, god_type god, int spell,
```

Replacement in crawl-ref/source/spells3.cc at line 475 [11.531613]

B:BD[19.2748] → [17.4589:4646]

    return _summon_demon_wrapper(pow, god, DEMON_LESSER,

[19.2748]

[18.1240]

    return _summon_demon_wrapper(pow, god, spell, DEMON_LESSER,

Replacement in crawl-ref/source/spells3.cc at line 480 [11.531613]
B:BD[19.2960] → [17.4647:4695]
```
bool summon_common_demon(int pow, god_type god,
```
[19.2960]
[17.4695]
```
bool summon_common_demon(int pow, god_type god, int spell,
```

Replacement in crawl-ref/source/spells3.cc at line 483 [11.531613]

B:BD[19.3011] → [17.4733:4790]

    return _summon_demon_wrapper(pow, god, DEMON_COMMON,

[19.3011]

[18.1432]

    return _summon_demon_wrapper(pow, god, spell, DEMON_COMMON,

Replacement in crawl-ref/source/spells3.cc at line 488 [11.531613]
B:BD[19.3223] → [17.4791:4840]
```
bool summon_greater_demon(int pow, god_type god,
```
[19.3223]
[17.4840]
```
bool summon_greater_demon(int pow, god_type god, int spell,
```

Replacement in crawl-ref/source/spells3.cc at line 491 [11.531613]

B:BD[19.3275] → [17.4879:4937]

    return _summon_demon_wrapper(pow, god, DEMON_GREATER,

[19.3275]

[20.1125]

    return _summon_demon_wrapper(pow, god, spell, DEMON_GREATER,

Replacement in crawl-ref/source/spells3.cc at line 495 [11.531613]

B:BD[18.1770] → [17.4938:5002]

bool summon_demon_type(monster_type mon, int pow, god_type god)

[18.1690]

[18.1835]

bool summon_demon_type(monster_type mon, int pow, god_type god,
                       int spell)

Replacement in crawl-ref/source/spells3.cc at line 498 [11.531613]
B:BD[18.1837] → [17.5003:5051]
```
    return _summon_demon_wrapper(pow, god, mon,
```
[18.1837]
[18.1890]
```
    return _summon_demon_wrapper(pow, god, spell, mon,
```

Replacement in crawl-ref/source/spells3.cc at line 507 [11.531613]

B:BD[19.3509] → [17.5099:5149]

    bool success = summon_common_demon(pow, god);

[19.3509]

[19.3564]

    bool success = summon_common_demon(pow, god, SPELL_SUMMON_DEMON);

Replacement in crawl-ref/source/spells3.cc at line 525 [11.531613]

B:BD[19.3859] → [17.5198:5247]

        if (summon_lesser_demon(pow, god, true))

[19.3859]

[19.3907]

        if (summon_lesser_demon(pow, god, SPELL_DEMONIC_HORDE, true))

Replacement in crawl-ref/source/spells3.cc at line 539 [11.531613]

B:BD[21.745] → [17.5303:5354]

    bool success = summon_greater_demon(pow, god);

[21.745]

[19.4156]

    bool success = summon_greater_demon(pow, god, SPELL_SUMMON_GREATER_DEMON);

Replacement in crawl-ref/source/spells3.cc at line 598 [11.531613]

B:BD[21.1543] → [21.1543:1613]

               mgen_data(MONS_TENTACLED_MONSTROSITY, BEH_FRIENDLY, 6,

[21.1543]

[21.1613]

               mgen_data(MONS_TENTACLED_MONSTROSITY, BEH_FRIENDLY,
                         6, SPELL_SUMMON_HORRIBLE_THINGS,

Replacement in crawl-ref/source/spells3.cc at line 612 [11.531613]

B:BD[21.1864] → [21.1864:1930]

               mgen_data(MONS_ABOMINATION_LARGE, BEH_FRIENDLY, 6,

[21.1864]

[21.1930]

               mgen_data(MONS_ABOMINATION_LARGE, BEH_FRIENDLY,
                         6, SPELL_SUMMON_HORRIBLE_THINGS,

Replacement in crawl-ref/source/spells3.cc at line 821 [11.531613]

B:BD[8.947] → [8.947:1000]

                                      0, a, hitting,

[8.947]

[17.5660]

                                      0, 0, a, hitting,

Replacement in crawl-ref/source/spells3.cc at line 1011 [11.531613]

B:BD[14.1191] → [14.1191:1251]

                              6, you.pos(), you.pet_target,

[14.1191]

[17.5997]

                              6, SPELL_SIMULACRUM,
                              you.pos(), you.pet_target,

Replacement in crawl-ref/source/spells3.cc at line 1094 [11.531613]

B:BD[22.406] → [22.406:458]

                      0, you.pos(), you.pet_target,

[22.406]

[17.6104]

                      0, SPELL_TWISTED_RESURRECTION,
                      you.pos(), you.pet_target,

Replacement in crawl-ref/source/spells3.cc at line 1146 [11.531613]

B:BD[21.2849] → [21.2849:2885]

                      5, you.pos(),

[21.2849]

[21.2885]

                      5, SPELL_SUMMON_WRAITHS,
                      you.pos(),

Replacement in crawl-ref/source/spells2.h at line 64 [11.562867]

B:BD[23.863] → [17.7045:7103]

bool summon_berserker(int pow, god_type god = GOD_NO_GOD,

[17.7044]

[24.292]

bool summon_berserker(int pow, god_type god = GOD_NO_GOD, int spell = 0,

Replacement in crawl-ref/source/spells2.h at line 66 [11.562867]

B:BD[24.343] → [10.386:447]

bool summon_holy_warrior(int pow, god_type god = GOD_NO_GOD,

[24.343]

[25.274]

bool summon_holy_warrior(int pow, god_type god = GOD_NO_GOD, int spell = 0,

Replacement in crawl-ref/source/spells2.h at line 70 [11.562867]

B:BD[10.548] → [10.548:604]

                            god_type god = GOD_NO_GOD);

[10.548]

[17.7258]

                            god_type god = GOD_NO_GOD, int spell = 0);

Replacement in crawl-ref/source/spells2.cc at line 945 [11.569242]

B:BD[26.1040] → [26.1040:1080]

                          4, you.pos(),

[26.1040]

[26.1080]

                          4, 0, you.pos(),

Replacement in crawl-ref/source/spells2.cc at line 964 [11.569242]

B:BD[27.403] → [27.403:462]

                mgen_data(MONS_BUTTERFLY, BEH_FRIENDLY, 3,

[27.403]

[27.462]

                mgen_data(MONS_BUTTERFLY, BEH_FRIENDLY,
                          3, SPELL_SUMMON_BUTTERFLIES,

Replacement in crawl-ref/source/spells2.cc at line 1024 [11.569242]

B:BD[28.1714] → [28.1714:1762]

                mgen_data(mon, BEH_FRIENDLY, 3,

[28.1714]

[28.1762]

                mgen_data(mon, BEH_FRIENDLY,
                          3, SPELL_SUMMON_SMALL_MAMMALS,

Replacement in crawl-ref/source/spells2.cc at line 1082 [11.569242]

B:BD[29.2001] → [29.2001:2047]

                    mgen_data(mon, beha, dur,

[29.2001]

[29.2047]

                    mgen_data(mon, beha,
                              dur, SPELL_STICKS_TO_SNAKES,

Replacement in crawl-ref/source/spells2.cc at line 1130 [11.569242]

B:BD[29.3767] → [29.3767:3809]

                mgen_data(mon, beha, dur,

[29.3767]

[29.3809]

                mgen_data(mon, beha,
                          dur, SPELL_STICKS_TO_SNAKES,

Replacement in crawl-ref/source/spells2.cc at line 1171 [11.569242]

B:BD[30.2887] → [30.2887:2927]

                          3, you.pos(),

[30.2887]

[30.2927]

                          3, SPELL_SUMMON_SCORPIONS,
                          you.pos(),

Replacement in crawl-ref/source/spells2.cc at line 1256 [11.569242]

B:BD[30.5767] → [30.5767:5809]

                          dur, you.pos(),

[30.5767]

[30.5809]

                          dur, !permanent ? SPELL_SUMMON_SWARM : 0,
                          you.pos(),

Replacement in crawl-ref/source/spells2.cc at line 1316 [11.569242]

B:BD[31.1439] → [31.1439:1477]

                      dur, you.pos(),

[31.1439]

[31.1477]

                      dur, SPELL_CALL_CANINE_FAMILIAR,
                      you.pos(),

Replacement in crawl-ref/source/spells2.cc at line 1458 [11.569242]

B:BD[8.1091] → [8.1091:1124]

                      dur, targ,

[8.1091]

[8.1124]

                      dur, SPELL_SUMMON_ELEMENTAL,
                      targ,

Replacement in crawl-ref/source/spells2.cc at line 1482 [11.569242]

B:BD[32.1207] → [8.1222:1268]

            mgen_data(mon, BEH_FRIENDLY, dur,

[32.1207]

[8.1268]

            mgen_data(mon, BEH_FRIENDLY,
                      dur, SPELL_SUMMON_ICE_BEAST,

Replacement in crawl-ref/source/spells2.cc at line 1508 [11.569242]

B:BD[33.953] → [33.953:991]

                      dur, you.pos(),

[33.953]

[33.991]

                      dur, SPELL_SUMMON_UGLY_THING,
                      you.pos(),

Replacement in crawl-ref/source/spells2.cc at line 1538 [11.569242]

B:BD[34.230] → [34.230:266]

                      3, you.pos(),

[34.230]

[34.266]

                      3, SPELL_SUMMON_DRAGON,
                      you.pos(),

Replacement in crawl-ref/source/spells2.cc at line 1555 [11.569242]

B:BD[35.532] → [17.8384:8449]

bool summon_berserker(int pow, god_type god, bool force_hostile)

[36.4435]

[36.4513]

bool summon_berserker(int pow, god_type god, int spell,
                      bool force_hostile)

Replacement in crawl-ref/source/spells2.cc at line 1606 [11.569242]

B:BD[30.6783] → [30.6783:6821]

                      dur, you.pos(),

[30.6783]

[30.6821]

                      dur, spell,
                      you.pos(),

Replacement in crawl-ref/source/spells2.cc at line 1633 [11.569242]

B:BD[11.606235] → [10.606:761]

static bool _summon_holy_being_wrapper(int pow, god_type god, monster_type mon,
                                       int dur, bool friendly, bool quiet)

[11.606235]

[37.275]

static bool _summon_holy_being_wrapper(int pow, god_type god, int spell,
                                       monster_type mon, int dur, bool friendly,
                                       bool quiet)

Replacement in crawl-ref/source/spells2.cc at line 1643 [11.569242]

B:BD[38.408] → [16.1059:1198]

                      dur, friendly ? MON_SUMM_AID : MON_SUMM_WRATH,
                      you.pos(), friendly ? you.pet_target : MHITYOU,

[38.408]

[17.8641]

                      dur, spell,
                      you.pos(),
                      friendly ? you.pet_target : MHITYOU,

Replacement in crawl-ref/source/spells2.cc at line 1667 [11.569242]

B:BD[39.490] → [10.781:985]

static bool _summon_holy_being_wrapper(int pow, god_type god,
                                       holy_being_class_type hbct,
                                       int dur, bool friendly, bool quiet)

[39.490]

[35.1944]

static bool _summon_holy_being_wrapper(int pow, god_type god, int spell,
                                       holy_being_class_type hbct, int dur,
                                       bool friendly, bool quiet)

Replacement in crawl-ref/source/spells2.cc at line 1673 [11.569242]

B:BD[40.1092] → [10.1039:1115]

    return _summon_holy_being_wrapper(pow, god, mon, dur, friendly, quiet);

[40.1092]

[35.2079]

    return _summon_holy_being_wrapper(pow, god, spell, mon, dur, friendly,
                                      quiet);

Replacement in crawl-ref/source/spells2.cc at line 1677 [11.569242]
B:BD[35.2082] → [25.353:401]
```
bool summon_holy_warrior(int pow, god_type god,
```
[35.2082]
[25.401]
```
bool summon_holy_warrior(int pow, god_type god, int spell,
```

Replacement in crawl-ref/source/spells2.cc at line 1681 [11.569242]

B:BD[35.2214] → [10.1177:1245]

    return _summon_holy_being_wrapper(pow, god, HOLY_BEING_WARRIOR,

[35.2214]

[25.500]

    return _summon_holy_being_wrapper(pow, god, spell, HOLY_BEING_WARRIOR,

Replacement in crawl-ref/source/spells2.cc at line 1688 [11.569242]

B:BD[40.1392] → [10.1375:1444]

bool summon_holy_being_type(monster_type mon, int pow, god_type god)

[40.1392]

[10.1444]

bool summon_holy_being_type(monster_type mon, int pow,
                            god_type god, int spell)

Replacement in crawl-ref/source/spells2.cc at line 1691 [11.569242]

B:BD[10.1446] → [10.1446:1499]

    return _summon_holy_being_wrapper(pow, god, mon,

[10.1446]

[10.1499]

    return _summon_holy_being_wrapper(pow, god, spell, mon,

Replacement in crawl-ref/source/religion.cc at line 942 [11.804403]

B:BD[41.4328] → [41.4328:4368]

                          0, you.pos(),

[41.4328]

[41.4368]

                          0, 0, you.pos(),

Replacement in crawl-ref/source/religion.cc at line 1535 [11.804403]

B:BD[42.11805] → [43.8973:9031]

                mgen_data(follower_type, BEH_FRIENDLY, 0,

[42.11805]

[17.11578]

                mgen_data(follower_type, BEH_FRIENDLY, 0, 0,

Replacement in crawl-ref/source/religion.cc at line 4032 [11.804403]

B:BD[43.9397] → [3.2431:2496]

            if (summon_holy_warrior(100, god, true, true, true))

[43.9397]

[10.4070]

            if (summon_holy_warrior(100, god, 0, true, true, true))

Replacement in crawl-ref/source/religion.cc at line 4418 [11.804403]

B:BD[44.411] → [45.3750:3810]

                if (summon_berserker(cost * 20, god, true))

[44.411]

[46.3007]

                if (summon_berserker(cost * 20, god, 0, true))

Replacement in crawl-ref/source/mstuff2.cc at line 94 [11.1340842]

B:BD[47.3101] → [47.3101:3162]

B:BD[47.3162] → [48.2565:2613]

                                  monster_type (*mpicker)(),
                                  int nsummons)

[47.3101]

[49.15581]

                                  spell_type spell_cast,
                                  monster_type (*mpicker)(), int nsummons)

Replacement in crawl-ref/source/mstuff2.cc at line 111 [11.1340842]

B:BD[8.3993] → [8.3993:4057]

                      duration, monster->pos(), monster->foe));

[8.3993]

[49.16036]

                      duration, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 215 [11.1340842]

B:BD[50.3013] → [50.3013:3074]

                          5, monster->pos(), monster->foe));

[50.3013]

[51.3049]

                          5, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 240 [11.1340842]

B:BD[8.4268] → [8.4268:4329]

                          3, monster->pos(), monster->foe));

[8.4268]

[11.1354250]

                          3, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 255 [11.1340842]

B:BD[52.3571] → [52.3571:3631]

                          SAME_ATTITUDE(monster), duration,

[52.3571]

[48.2846]

                          SAME_ATTITUDE(monster), duration, spell_cast,

Replacement in crawl-ref/source/mstuff2.cc at line 275 [11.1340842]

B:BD[8.4385] → [8.4385:4453]

                          duration, monster->pos(), monster->foe));

[8.4385]

[11.1355017]

                          duration, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 294 [11.1340842]

B:BD[8.4504] → [8.4504:4572]

                          duration, monster->pos(), monster->foe));

[8.4504]

[11.1355756]

                          duration, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 309 [11.1340842]

B:BD[8.4638] → [8.4638:4706]

                          duration, monster->pos(), monster->foe));

[8.4638]

[53.3049]

                          duration, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 322 [11.1340842]

B:BD[8.4772] → [8.4772:4840]

                          duration, monster->pos(), monster->foe));

[8.4772]

[11.1356239]

                          duration, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 329 [11.1340842]

B:BD[8.4899] → [8.4899:4956]

                      4, monster->pos(), monster->foe));

[8.4899]

[11.1356450]

                      4, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 335 [11.1340842]

B:BD[8.5019] → [8.5019:5076]

                      5, monster->pos(), monster->foe));

[8.5019]

[49.17009]

                      5, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 349 [11.1340842]

B:BD[54.3657] → [48.3288:3356]

                          duration, monster->pos(), monster->foe));

[54.3657]

[55.2571]

                          duration, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 354 [11.1340842]

B:BD[49.17194] → [47.3415:3490]

B:BD[47.3490] → [48.3357:3408]

        _do_high_level_summon(monster, monsterNearby, _pick_random_wraith,
                              random_range(3, 6));

[49.17194]

[49.17317]

        _do_high_level_summon(monster, monsterNearby, spell_cast,
                              _pick_random_wraith, random_range(3, 6));

Replacement in crawl-ref/source/mstuff2.cc at line 359 [11.1340842]

B:BD[49.17373] → [47.3542:3618]

B:BD[47.3618] → [48.3409:3460]

        _do_high_level_summon(monster, monsterNearby, _pick_horrible_thing,
                              random_range(3, 5));

[49.17373]

[49.17497]

        _do_high_level_summon(monster, monsterNearby, spell_cast,
                              _pick_horrible_thing, random_range(3, 5));

Replacement in crawl-ref/source/mstuff2.cc at line 370 [11.1340842]

B:BD[8.5176] → [8.5176:5237]

                          2, monster->pos(), monster->foe));

[8.5176]

[56.4378]

                          2, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 376 [11.1340842]

∅:D[57.2632] → [47.3670:3745]

B:BD[49.17580] → [47.3670:3745]

        _do_high_level_summon(monster, monsterNearby, _pick_undead_summon,

[57.2632]

[48.3461]

        _do_high_level_summon(monster, monsterNearby, spell_cast,
                              _pick_undead_summon,

Replacement in crawl-ref/source/mstuff2.cc at line 401 [11.1340842]

B:BD[8.5288] → [8.5288:5356]

                          duration, monster->pos(), monster->foe));

[8.5288]

[11.1358310]

                          duration, spell_cast, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 435 [11.1340842]

B:BD[8.5424] → [8.5424:5496]

                              duration, monster->pos(), monster->foe));

[8.5424]

[58.820]

                              duration, spell_cast,
                              monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 2395 [11.1340842]

B:BD[59.2746] → [6.2624:2689]

                SAME_ATTITUDE(mons), 5, foe->pos(), mons->foe));

[59.2746]

[60.410156]

                SAME_ATTITUDE(mons), 5, 0, foe->pos(), mons->foe));

Replacement in crawl-ref/source/monstuff.cc at line 1309 [11.1396662]

B:BD[7.3109] → [7.3109:3176]

                                0, monster->pos(), you.pet_target,

[7.3109]

[7.3176]

                                0, 0, monster->pos(), you.pet_target,

Replacement in crawl-ref/source/monstuff.cc at line 5631 [11.1396662]

B:BD[61.7773] → [5.2534:2595]

                          0, monster->pos(), monster->foe));

[61.7773]

[61.7835]

                          0, 0, monster->pos(), monster->foe));

Insertion in crawl-ref/source/monplace.h at line 185 [11.1638277]
[42.20276]
[42.20276]
```
              int st = 0,
```

Deletion in crawl-ref/source/monplace.h at line 198 [11.1638277]

B:BD[42.20734] → [16.12060:12912]

          abjuration_duration(abj), summon_type(0), pos(p), foe(mfoe),
          flags(monflags), god(which_god), number(monnumber), colour(moncolour),
          power(monpower), proximity(prox), level_type(ltype), map_mask(0)
    {
    }
    mgen_data(monster_type mt,
              beh_type beh,
              int abj,
              int st,
              const coord_def &p = coord_def(-1, -1),
              unsigned short mfoe = MHITNOT,
              unsigned monflags = 0,
              god_type which_god = GOD_NO_GOD,
              monster_type base = MONS_PROGRAM_BUG,
              int monnumber = 0,
              int moncolour = BLACK,
              int monpower = you.your_level,
              proximity_type prox = PROX_ANYWHERE,
              level_area_type ltype = you.level_type)
        : cls(mt), base_type(base), behaviour(beh),

Replacement in crawl-ref/source/monplace.h at line 219 [11.1638277]

B:BD[42.21418] → [2.2572:2641]

        return mgen_data(what, BEH_SLEEP, 0, where, MHITNOT, flags);

[42.21418]

[42.21471]

        return mgen_data(what, BEH_SLEEP, 0, 0, where, MHITNOT, flags);

Replacement in crawl-ref/source/mon-util.h at line 88 [11.1682293]

B:BD[16.13433] → [16.13433:13508]

B:BD[16.13508] → [8.5570:5629]

// Non-spell "summoning" types to give to monsters::mark_summoned(), or as
// the fourth parameter of mgen_data's second constructor.

[16.13433]

[16.13567]

// Non-spell "summoning" types to give to monsters::mark_summoned(), or
// as the fourth parameter of mgen_data's constructor.

Replacement in crawl-ref/source/item_use.cc at line 4470 [11.2781507]

B:BD[62.3676] → [4.2600:2664]

                          0, you.pos(), you.pet_target)) != -1)

[62.3676]

[11.2861804]

                          0, 0, you.pos(), you.pet_target)) != -1)

Replacement in crawl-ref/source/it_use3.cc at line 229 [11.2870456]

B:BD[63.3234] → [63.3234:3292]

                          2, you.pos(), you.pet_target));

[63.3234]

[64.3350]

                          2, 0, you.pos(), you.pet_target));

Replacement in crawl-ref/source/it_use3.cc at line 718 [11.2870456]

B:BD[65.2700] → [65.2700:2736]

                      0, you.pos(),

[65.2700]

[66.2933]

                      0, 0, you.pos(),

Replacement in crawl-ref/source/it_use3.cc at line 1011 [11.2870456]

B:BD[42.45228] → [67.3603:3659]

                mgen_data(beasty, beha, 2 + random2(4),

[42.45228]

[67.3659]

                mgen_data(beasty, beha, 2 + random2(4), 0,

Replacement in crawl-ref/source/fight.cc at line 2577 [11.3140790]

B:BD[68.19058] → [68.19058:19132]

                           mgen_data(type, mon->behaviour, 0, mon->pos(),

[68.19058]

[68.19132]

                           mgen_data(type, mon->behaviour, 0, 0, mon->pos(),

Replacement in crawl-ref/source/dungeon.cc at line 3306 [11.3429798]
B:BD[42.47150] → [69.2959:3008]
```
        mgen_data mg(which_unique, BEH_SLEEP, 0,
```
[42.47150]
[69.3008]
```
        mgen_data mg(which_unique, BEH_SLEEP, 0, 0,
```

Replacement in crawl-ref/source/decks.cc at line 2501 [11.3987460]

B:BD[70.2733] → [8.7053:7100]

                              BEH_FRIENDLY, 5,

[70.2733]

[8.7100]

                              BEH_FRIENDLY, 5, 0,

Replacement in crawl-ref/source/decks.cc at line 2687 [11.3987460]

B:BD[70.2901] → [70.2901:2944]

                  std::min(power / 50, 6),

[70.2901]

[70.2944]

                  std::min(power / 50, 6), 0,

Replacement in crawl-ref/source/decks.cc at line 2740 [11.3987460]

B:BD[70.3079] → [71.11081:11115]

                  3, chosen_spot,

[70.3079]

[72.2679]

                  3, 0,
                  chosen_spot,

Replacement in crawl-ref/source/decks.cc at line 2754 [11.3987460]

B:BD[70.3286] → [70.3286:3336]

                      power_level + 3, you.pos(),

[70.3286]

[70.3336]

                      power_level + 3, 0, you.pos(),

Deletion in crawl-ref/source/decks.cc at line 2817 [11.3987460]
B:BD[73.62142] → [73.62142:62148]
```
    {
```
Deletion in crawl-ref/source/decks.cc at line 2818 [11.3987460]
B:BD[74.1011] → [73.62149:62155]
```
    }
```
Replacement in crawl-ref/source/decks.cc at line 2844 [11.3987460]
B:BD[42.52806] → [70.3632:3669]
```
            std::min(power / 50, 6),
```
[42.52806]
[42.52840]
```
            std::min(power / 50, 6), 0,
```

Replacement in crawl-ref/source/decks.cc at line 2864 [11.3987460]

B:BD[70.3751] → [70.3751:3794]

                  std::min(power / 50, 6),

[70.3751]

[70.3794]

                  std::min(power / 50, 6), 0,