fiddlerwoaroof/crawl - Change P2NAXH6LSMPHCUNEJ6GFCFDVFKHDYBURZE7GRJOEW7L54CCVO4MAC

Move summon_demon_type() to spells3.cc as well.

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

Created by dolorous on June 8, 2008

P2NAXH6LSMPHCUNEJ6GFCFDVFKHDYBURZE7GRJOEW7L54CCVO4MAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells3.h at line 119 [3.526814]

[2.716]

bool summon_demon_type(monster_type mon, int pow, bool god_gift = false);

Insertion in crawl-ref/source/spells3.cc at line 530 [3.531613]

[2.4175]

        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}
// Makhleb or Kikubaaqudgha sends a demonic buddy (or enemy) for a
// follower.
bool summon_demon_type(monster_type mon, int pow, bool god_gift)
{
    bool success = false;
    const int dur = std::min(2 + (random2(pow) / 4), 6);
    const bool friendly = (random2(pow) > 3);
    if (create_monster(
            mgen_data(mon,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      dur, you.pos(),
                      friendly ? you.pet_target : MHITYOU,
                      god_gift ? MF_GOD_GIFT : 0)) != -1)
    {
        success = true;
        mprf("A demon appears!%s",
             friendly ? "" : " It doesn't look very happy.");
    }
    else

Deletion in crawl-ref/source/spells2.h at line 162 [3.562867]
∅:D[4.863] → [5.347:421]
B:BD[6.343] → [5.347:421]
```
bool summon_demon_type(monster_type mon, int pow, bool god_gift = false);
```
Deletion in crawl-ref/source/spells2.cc at line 2103 [3.569242]
B:BD[4.3010] → [4.3010:3013]
∅:D[4.3013] → [7.2032:2112]
B:BD[8.4082] → [7.2032:2112]
∅:D[7.2112] → [5.2639:2704]
B:BD[5.2639] → [5.2639:2704]
∅:D[5.2704] → [8.4130:4132]
B:BD[8.4130] → [8.4130:4132]
B:BD[8.4641] → [8.4641:4667]
∅:D[8.4667] → [3.606095:606096]
B:BD[3.606095] → [3.606095:606096]
B:BD[3.606096] → [8.4668:4725]
∅:D[9.1690] → [10.1387:1388]
∅:D[11.2381] → [10.1387:1388]
∅:D[8.4725] → [10.1387:1388]
B:BD[10.1387] → [10.1387:1388]
B:BD[10.1388] → [12.581:627]
∅:D[12.627] → [13.4293:4294]
∅:D[14.718] → [13.4293:4294]
∅:D[8.4772] → [13.4293:4294]
B:BD[13.4293] → [13.4293:4294]
B:BD[13.4294] → [8.4773:4982]
B:BD[8.4982] → [12.628:686]
∅:D[12.686] → [15.424:430]
∅:D[14.762] → [15.424:430]
∅:D[8.5040] → [15.424:430]
B:BD[15.424] → [15.424:430]
∅:D[10.1447] → [13.4295:4320]
B:BD[15.430] → [13.4295:4320]
B:BD[13.4320] → [8.5041:5138]
∅:D[13.4447] → [15.575:581]
∅:D[8.5138] → [15.575:581]
B:BD[15.575] → [15.575:581]
B:BD[15.581] → [16.1188:1197]
∅:D[16.1197] → [17.1296:1337]
∅:D[10.1469] → [17.1296:1337]
B:BD[17.1296] → [17.1296:1337]
∅:D[17.1337] → [13.4448:4471]
B:BD[15.581] → [13.4448:4471]
```
}
// Makhleb or Kikubaaqudgha sends a demonic buddy (or enemy) for a
// follower.
bool summon_demon_type(monster_type mon, int pow, bool god_gift)
{
    bool success = false;
    const int dur = std::min(2 + (random2(pow) / 4), 6);
    const bool friendly = (random2(pow) > 3);
    if (create_monster(
            mgen_data(mon,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      dur, you.pos(),
                      friendly ? you.pet_target : MHITYOU,
                      god_gift ? MF_GOD_GIFT : 0)) != -1)
    {
        success = true;
        mprf("A demon appears!%s",
             friendly ? "" : " It doesn't look very happy.");
    }
    else
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
```