fiddlerwoaroof/crawl - Change GB3AUQG7L5SP2UWS4SBW6OTBTHHDQA7W2TVPOVDWWFPQ4GEDV27QC

Move cast_summon_butterflies() to the right place.

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

Created by dolorous on June 8, 2008

GB3AUQG7L5SP2UWS4SBW6OTBTHHDQA7W2TVPOVDWWFPQ4GEDV27QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells2.cc at line 1467 [4.569242]

[3.1815]

}
bool cast_summon_butterflies(int pow, bool god_gift)
{
    bool success = false;
    const int how_many = std::max(15, 4 + random2(3) + random2(pow) / 10);
    for (int i = 0; i < how_many; ++i)
    {
        if (create_monster(
                mgen_data(MONS_BUTTERFLY, BEH_FRIENDLY, 3,
                          you.pos(), you.pet_target,
                          god_gift ? MF_GOD_GIFT : 0)) != -1)
        {
            success = true;
        }
    }
    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);

Deletion in crawl-ref/source/spells2.cc at line 1547 [4.569242]

B:BD[2.2030] → [2.2030:2031]

∅:D[2.2031] → [5.1905:2062]

B:BD[5.1905] → [5.1905:2062]


bool cast_summon_butterflies(int pow, bool god_gift)
{
    bool success = false;
    const int how_many = std::max(15, 4 + random2(3) + random2(pow) / 10);

Deletion in crawl-ref/source/spells2.cc at line 1548 [4.569242]

B:BD[5.2063] → [5.2063:2450]

    for (int i = 0; i < how_many; ++i)
    {
        if (create_monster(
                mgen_data(MONS_BUTTERFLY, BEH_FRIENDLY, 3,
                          you.pos(), you.pet_target,
                          god_gift ? MF_GOD_GIFT : 0)) != -1)
        {
            success = true;
        }
    }
    if (!success)
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}