fiddlerwoaroof/crawl - Change NIJDQAJEWQIYKPDWIXYCCT4JIWVE6CWJ3J3K4N5PPGHWENGNZZXQC

Handle it properly when Xom tries to send mutiple summons and fails.

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

Created by dolorous on April 27, 2008

NIJDQAJEWQIYKPDWIXYCCT4JIWVE6CWJ3J3K4N5PPGHWENGNZZXQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 512 [6.3]
[4.49]
[5.1756]
```
        bool success = false;
```

Insertion in crawl-ref/source/xom.cc at line 528 [6.3]

[4.249]


            if (summons[i] != -1)
                success = true;

Replacement in crawl-ref/source/xom.cc at line 533 [6.3]

B:BD[4.260] → [3.5:84]

        if (numdifferent != numdemons && numdifferent > 0 && hostiletype != 0)

[4.260]

[4.319]

        if (success && numdifferent != numdemons && numdifferent > 0
            && hostiletype != 0)

Replacement in crawl-ref/source/xom.cc at line 557 [6.3]

B:BD[5.2134] → [5.2134:2173]

B:BD[5.2173] → [2.927:1002]

∅:D[2.1002] → [5.2253:2288]

B:BD[5.2253] → [5.2253:2288]

B:BD[5.2288] → [2.1003:1079]

∅:D[2.1079] → [5.2369:2382]

B:BD[5.2369] → [5.2369:2382]

B:BD[5.2382] → [2.1080:1150]

        if (numdifferent == numdemons)
            god_speaks(GOD_XOM, _get_xom_speech("multiple holy summons"));
        else if (numdifferent > 0)
            god_speaks(GOD_XOM, _get_xom_speech("multiple mixed summons"));
        else
            god_speaks(GOD_XOM, _get_xom_speech("multiple summons"));

[5.2134]

[5.2453]

        if (success)
        {
            if (numdifferent == numdemons)
                god_speaks(GOD_XOM, _get_xom_speech("multiple holy summons"));
            else if (numdifferent > 0)
                god_speaks(GOD_XOM, _get_xom_speech("multiple mixed summons"));
            else
                god_speaks(GOD_XOM, _get_xom_speech("multiple summons"));

Replacement in crawl-ref/source/xom.cc at line 566 [6.3]
∅:D[5.2454] → [6.14565:14586]
B:BD[6.14565] → [6.14565:14586]
```
        done = true;
```
[5.2454]
[6.14586]
```
            done = true;
        }
```