fiddlerwoaroof/crawl - Change SYNARO4WXXFW5D6XQYFPSNS23LK44OPQPKPUD4PNL3AWKQWGA5WQC

Consolidate the (single) spatial vortex-summoning routines, and add more

minor cleanups.

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

Created by dolorous on June 9, 2008

SYNARO4WXXFW5D6XQYFPSNS23LK44OPQPKPUD4PNL3AWKQWGA5WQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 2372 [6.293070]

B:BD[5.8559] → [5.8559:8608]

B:BD[5.8608] → [7.1824:1852]

B:BD[7.1852] → [8.161:272]

            mpr("Space twists in upon itself!");
            create_monster(
                mgen_data(MONS_SPATIAL_VORTEX, BEH_HOSTILE, 3,
                          you.pos(), MHITYOU));

[5.8559]

[6.352784]

            summon_spatial_vortex();

Replacement in crawl-ref/source/spl-cast.cc at line 2497 [6.293070]

B:BD[5.11878] → [5.11878:11927]

B:BD[5.11927] → [7.2131:2270]

            mpr("Space twists in upon itself!");
            create_monster(
                mgen_data(MONS_SPATIAL_VORTEX, BEH_HOSTILE, 3,
                          you.pos(), MHITYOU));

[5.11878]

[5.12058]

            summon_spatial_vortex();

Replacement in crawl-ref/source/spells3.cc at line 420 [6.531613]

B:BD[4.459] → [4.459:696]

                        !force_hostile ? BEH_FRIENDLY : BEH_HOSTILE,
                        2, you.pos(),
                        !force_hostile ? you.pet_target : MHITYOU,
                        (god_gift ? MG_GOD_GIFT : 0))) != -1);

[4.459]

[9.924]

                         !force_hostile ? BEH_FRIENDLY : BEH_HOSTILE,
                         2, you.pos(),
                         !force_hostile ? you.pet_target : MHITYOU,
                         (god_gift ? MG_GOD_GIFT : 0))) != -1);

Replacement in crawl-ref/source/spells2.h at line 155 [6.562867]
B:BD[10.152] → [10.152:182]
```
void summon_animals(int pow);
```
[6.567871]
[6.567903]
```
bool summon_spatial_vortex(bool god_gift = false);
bool summon_animals(int pow);
```

Insertion in crawl-ref/source/spells2.cc at line 973 [6.569242]

[2.561]

[6.599614]


bool summon_spatial_vortex(bool god_gift)
{
    mpr("Space twists in upon itself!");

Replacement in crawl-ref/source/spells2.cc at line 978 [6.569242]

B:BD[6.604190] → [10.482:511]

void summon_animals(int pow)

[6.599615]

[10.511]

    return (create_monster(
               mgen_data(MONS_SPATIAL_VORTEX, BEH_HOSTILE,
                         3, you.pos(),
                         MHITYOU, (god_gift ? MG_GOD_GIFT : 0))) != -1);
}
bool summon_animals(int pow)

Insertion in crawl-ref/source/spells2.cc at line 986 [6.569242]
[10.513]
[3.169]
```
    bool success = false;
```

Replacement in crawl-ref/source/spells2.cc at line 1025 [6.569242]

B:BD[10.1498] → [7.7425:7449]

B:BD[7.7449] → [11.3604:3789]

        create_monster(
            mgen_data(mon,
                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                      4, you.pos(),
                      friendly ? you.pet_target : MHITYOU));

[10.1498]

[10.1809]

        if (create_monster(
                mgen_data(mon,
                          friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                          4, you.pos(),
                          friendly ? you.pet_target : MHITYOU)) != -1)
        {
            success = true;
        }

Insertion in crawl-ref/source/spells2.cc at line 1034 [6.569242]
[10.1815]
[12.169]
```
    return (success);
```