fiddlerwoaroof/crawl - Change QFHC4VZHHDG5PKLY7A263OJFT2OQ3MF2HX423AKINPRNR5UUT7LQC

Clean up again.

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

Created by dolorous on June 7, 2008

QFHC4VZHHDG5PKLY7A263OJFT2OQ3MF2HX423AKINPRNR5UUT7LQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1514 [4.293070]

[2.249]

[3.261]

    case SPELL_SUMMON_GREATER_DEMON:
        cast_summon_greater_demon(powc);
        break;

Deletion in crawl-ref/source/spl-cast.cc at line 1519 [4.293070]
B:BD[5.231] → [6.161:198]
```
    case SPELL_SUMMON_GREATER_DEMON:
```
Insertion in crawl-ref/source/spells2.h at line 161 [4.562867]
[2.319]
[7.1722]
```
bool cast_summon_greater_demon(int pow, bool god_gift = false);
```

Replacement in crawl-ref/source/spells2.cc at line 1895 [4.569242]

B:BD[3.616] → [3.616:674]

                                  int dur, bool friendly)

[3.616]

[3.674]

                                  int dur, bool friendly, bool charmed)

Replacement in crawl-ref/source/spells2.cc at line 1903 [4.569242]

B:BD[3.801] → [3.801:862]

                      friendly ? BEH_FRIENDLY : BEH_HOSTILE,

[3.801]

[3.862]

                      friendly ? BEH_FRIENDLY :
                          charmed ? BEH_CHARMED : BEH_HOSTILE,

Replacement in crawl-ref/source/spells2.cc at line 1927 [4.569242]

B:BD[3.1372] → [3.1372:1424]

                                 random2(pow) > 3);

[3.1372]

[3.1424]

                                 random2(pow) > 3, false);

Replacement in crawl-ref/source/spells2.cc at line 1942 [4.569242]

B:BD[3.1770] → [3.1770:1823]

                                  random2(pow) > 3))

[3.1770]

[3.1823]

                                  random2(pow) > 3, false))

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

[8.1670]


bool cast_summon_greater_demon(int pow, bool god_gift)
{
    bool success = false;
    mpr("You open a gate to Pandemonium!");
    bool charmed = (random2(pow) > 5);
    if (_summon_demon_wrapper(pow, god_gift, DEMON_GREATER,
                              5, false, charmed))
    {
        success = true;
        mpr("A demon appears!");

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

[8.1671]

[9.346]

        if (charmed)
            mpr("You don't feel so good about this...");
    }
    return (success);
}

Replacement in crawl-ref/source/spells2.cc at line 2036 [4.569242]

B:BD[4.605084] → [10.169:315]

    beh_type beha = (spell == SPELL_SUMMON_GREATER_DEMON) ? BEH_CHARMED
                                                          : BEH_FRIENDLY;

[4.605084]

[9.785]

    int hostile = (spell == SPELL_SUMMON_WRAITHS
                    || spell == SPELL_SUMMON_DRAGON) ? 5
                                                     : -1;

Replacement in crawl-ref/source/spells2.cc at line 2040 [4.569242]

B:BD[9.786] → [2.1351:1406]

∅:D[2.1406] → [9.1117:1294]

B:BD[9.1117] → [9.1117:1294]

    int hostile = (spell == SPELL_SUMMON_GREATER_DEMON
                    || spell == SPELL_SUMMON_WRAITHS
                    || spell == SPELL_SUMMON_DRAGON)     ? 5
                                                         : -1;

[9.786]

[9.1294]

    int dur = (spell == SPELL_SUMMON_WRAITHS) ? 5
                                              : -1;

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

B:BD[9.1295] → [7.6394:6445]

∅:D[7.6445] → [11.457:571]

B:BD[11.457] → [11.457:571]

∅:D[11.571] → [9.1583:1584]

B:BD[9.1583] → [9.1583:1584]

    int dur = (spell == SPELL_SUMMON_GREATER_DEMON
                || spell == SPELL_SUMMON_WRAITHS)   ? 5
                                                    : -1;

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

B:BD[9.4536] → [3.2022:2146]

            case SPELL_SUMMON_GREATER_DEMON:
                mon = summon_any_demon(DEMON_GREATER);
                break;

Deletion in crawl-ref/source/spells2.cc at line 2076 [4.569242]
B:BD[9.5226] → [9.5226:5227]
B:BD[9.5227] → [3.2147:2206]
∅:D[3.2206] → [9.5385:5437]
B:BD[9.5385] → [9.5385:5437]
```
        if (i == 0 && spell == SPELL_SUMMON_GREATER_DEMON)
            mpr("You open a gate to Pandemonium!");
```

Replacement in crawl-ref/source/spells2.cc at line 2077 [4.569242]

B:BD[9.5448] → [8.1672:1731]

        if (summon_general_creature(pow, false, mon, beha,

[9.5448]

[11.572]

        if (summon_general_creature(pow, false, mon, BEH_FRIENDLY,