fiddlerwoaroof/crawl - Change L6ZDC34R3PLXM4UIEOVIAX3X4JIFFTMURK45JECVA5R72H5Q6D4QC

Clean up Xom's single summoning routines again.

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

Created by dolorous on June 23, 2008

L6ZDC34R3PLXM4UIEOVIAX3X4JIFFTMURK45JECVA5R72H5Q6D4QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 573 [6.3]
B:BD[5.1508] → [4.40:71]
```
        // different messages.
```
[5.1508]
[5.1509]
```
        // different messages below.
```

Deletion in crawl-ref/source/xom.cc at line 575 [6.3]

∅:D[5.1547] → [7.2710:2711]

B:BD[7.2710] → [7.2710:2711]

B:BD[7.2711] → [5.1548:1723]


        if (different)
            god_speaks(GOD_XOM, _get_xom_speech("single holy summon"));
        else
            god_speaks(GOD_XOM, _get_xom_speech("single summon"));

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

[8.276]

[9.397]


        int summons = create_monster(
                          mgen_data(mon, beha, 6,
                              you.pos(), hitting, MG_FORCE_BEH, GOD_XOM));

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

B:BD[9.398] → [5.1830:1858]

∅:D[10.187] → [8.277:317]

∅:D[5.1858] → [8.277:317]

B:BD[11.201] → [8.277:317]

B:BD[8.317] → [5.1859:1925]

        if (create_monster(
                mgen_data(mon, beha, 6,
                          you.pos(), hitting, 0, GOD_XOM)) == -1)

[9.398]

[6.15329]

        if (summons != -1)

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

B:BD[6.15339] → [3.60:115]

∅:D[12.62] → [5.1971:1981]

∅:D[13.63] → [5.1971:1981]

∅:D[3.115] → [5.1971:1981]

∅:D[14.127] → [5.1971:1981]

∅:D[15.209] → [5.1971:1981]

B:BD[5.1971] → [5.1971:1981]

            god_speaks(GOD_XOM, "\"No, forget it.\"");
        }

[6.15339]

[10.288]

            if (different)
                god_speaks(GOD_XOM, _get_xom_speech("single holy summon"));
            else
                god_speaks(GOD_XOM, _get_xom_speech("single summon"));
            player_angers_monster(&menv[summons]);

Replacement in crawl-ref/source/xom.cc at line 599 [6.3]
B:BD[10.289] → [5.1982:2003]
```
        done = true;
```
[10.289]
[6.15718]
```
            done = true;
        }
```
Replacement in crawl-ref/source/xom.cc at line 664 [6.3]
B:BD[5.2073] → [4.72:103]
```
        // different messages.
```
[5.2073]
[5.2074]
```
        // different messages below.
```

Deletion in crawl-ref/source/xom.cc at line 667 [6.3]

B:BD[5.2113] → [5.2113:2227]

B:BD[5.2227] → [2.66:145]

∅:D[2.145] → [16.1042:1043]

∅:D[5.2300] → [16.1042:1043]

B:BD[16.1042] → [16.1042:1043]

        if (different)
            god_speaks(GOD_XOM, _get_xom_speech("single major holy summon"));
        else
            god_speaks(GOD_XOM, _get_xom_speech("single major demon summon"));

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

B:BD[9.856] → [5.2406:2434]

B:BD[5.2434] → [17.1681:1751]

∅:D[17.1751] → [18.344:379]

B:BD[18.344] → [18.344:379]

B:BD[18.379] → [5.2435:2501]

        if (create_monster(
                mgen_data(_xom_random_demon(sever, one_chance_in(8)),
                          beha, 0,
                          you.pos(), hitting, 0, GOD_XOM)) == -1)

[9.856]

[6.18034]

        int summons = create_monster(
                          mgen_data(_xom_random_demon(sever, one_chance_in(8)),
                              beha, 0,
                              you.pos(), hitting, MG_FORCE_BEH, GOD_XOM));
        if (summons != -1)

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

B:BD[6.18044] → [12.63:118]

∅:D[12.118] → [5.2547:2557]

∅:D[14.186] → [5.2547:2557]

∅:D[15.266] → [5.2547:2557]

B:BD[5.2547] → [5.2547:2557]

            god_speaks(GOD_XOM, "\"No, forget it.\"");
        }

[6.18044]

[16.1249]

            if (different)
                god_speaks(GOD_XOM, _get_xom_speech("single major holy summon"));
            else
                god_speaks(GOD_XOM, _get_xom_speech("single major demon summon"));
            player_angers_monster(&menv[summons]);

Replacement in crawl-ref/source/xom.cc at line 691 [6.3]
B:BD[16.1250] → [5.2558:2579]
```
        done = true;
```
[16.1250]
[6.18348]
```
            done = true;
        }
```