fiddlerwoaroof/crawl - Change 5ETBQI75XWCYG5UALQR6TKD7FCJYTCVQEN64D6OHXVOGO3QB3AKAC

After some more thought (and discussion with dploog), remove the code

marking creatures summoned by priestly monsters as god gifts. It can wait until priestly monsters get proper invocations.

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

Created by dolorous on June 10, 2008

5ETBQI75XWCYG5UALQR6TKD7FCJYTCVQEN64D6OHXVOGO3QB3AKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 479 [7.1340842]

B:BD[5.3162] → [6.2565:2629]

                                  int nsummons, unsigned flags)

[5.3162]

[8.15581]

                                  int nsummons)

Replacement in crawl-ref/source/mstuff2.cc at line 495 [7.1340842]

B:BD[4.2633] → [4.2633:2694]

                      monster->pos(), monster->foe, flags));

[4.2633]

[8.16036]

                      monster->pos(), monster->foe));

Deletion in crawl-ref/source/mstuff2.cc at line 511 [7.1340842]

B:BD[7.1351715] → [7.1351715:1351716]

B:BD[7.1351716] → [6.2810:3002]

B:BD[6.3002] → [3.2565:2694]


    // XXX: Mark summoned creatures from priestly monsters as god gifts.
    // Once monsters can worship gods (and, presumably, get invocation
    // lists), this should no longer be needed.
    const bool is_priest = (mons_class_flag(monster->type, M_PRIEST));
    const unsigned flags = (is_priest) ? MG_GOD_GIFT : 0;

Replacement in crawl-ref/source/mstuff2.cc at line 584 [7.1340842]

B:BD[4.2962] → [4.2962:3027]

                          monster->pos(), monster->foe, flags));

[4.2962]

[9.3049]

                          monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 598 [7.1340842]

B:BD[4.3233] → [4.3233:3298]

                          monster->pos(), monster->foe, flags));

[4.3233]

[7.1353886]

                          monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 609 [7.1340842]

B:BD[4.3372] → [4.3372:3437]

                          monster->pos(), monster->foe, flags));

[4.3372]

[7.1354250]

                          monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 625 [7.1340842]

B:BD[4.3631] → [4.3631:3696]

                          monster->pos(), monster->foe, flags));

[4.3631]

[10.3205]

                          monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 644 [7.1340842]

B:BD[4.4051] → [4.4051:4116]

                          monster->pos(), monster->foe, flags));

[4.4051]

[7.1355017]

                          monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 651 [7.1340842]

B:BD[11.2747] → [3.2695:2742]

                     monster->foe, is_priest);

[11.2747]

[7.1355215]

                     monster->foe);

Replacement in crawl-ref/source/mstuff2.cc at line 663 [7.1340842]

B:BD[4.4371] → [4.4371:4436]

                          monster->pos(), monster->foe, flags));

[4.4371]

[7.1355756]

                          monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 678 [7.1340842]

B:BD[4.4649] → [4.4649:4714]

                          monster->pos(), monster->foe, flags));

[4.4649]

[12.3049]

                          monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 691 [7.1340842]

B:BD[13.15241] → [6.3585:3650]

                          monster->pos(), monster->foe, flags));

[13.15241]

[7.1356239]

                          monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 698 [7.1340842]

B:BD[6.3736] → [6.3736:3797]

                      monster->pos(), monster->foe, flags));

[6.3736]

[7.1356450]

                      monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 704 [7.1340842]

B:BD[13.15529] → [6.3798:3859]

                      monster->pos(), monster->foe, flags));

[13.15529]

[8.17009]

                      monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 718 [7.1340842]

B:BD[10.3657] → [6.3860:3935]

                          duration, monster->pos(), monster->foe, flags));

[10.3657]

[14.2571]

                          duration, monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 724 [7.1340842]

B:BD[5.3490] → [6.3936:3994]

                              random_range(3, 6), flags);

[5.3490]

[8.17317]

                              random_range(3, 6));

Replacement in crawl-ref/source/mstuff2.cc at line 729 [7.1340842]

B:BD[5.3618] → [6.3995:4053]

                              random_range(3, 5), flags);

[5.3618]

[8.17497]

                              random_range(3, 5));

Replacement in crawl-ref/source/mstuff2.cc at line 734 [7.1340842]

B:BD[5.3745] → [6.4054:4173]

                              2 + random2(2) + random2(monster->hit_dice/4 + 1),
                              flags);

[5.3745]

[7.1357347]

                              2 + random2(2)
                                + random2(monster->hit_dice / 4 + 1));

Replacement in crawl-ref/source/mstuff2.cc at line 759 [7.1340842]

B:BD[10.3860] → [6.4174:4239]

                          monster->pos(), monster->foe, flags));

[10.3860]

[7.1358310]

                          monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 793 [7.1340842]

B:BD[13.16253] → [6.4240:4309]

                              monster->pos(), monster->foe, flags));

[13.16253]

[15.820]

                              monster->pos(), monster->foe));

Replacement in crawl-ref/source/mstuff2.cc at line 861 [7.1340842]
B:BD[7.1359792] → [7.1359792:1359816]
```
    fire_beam( pbolt );
```
[7.1359792]
[2.2565]
```
    fire_beam(pbolt);
```