fiddlerwoaroof/crawl - Change 64LQALS66EFDRQUEN3NRAWD2PWE7VMNRSEUTMRKQSEQTS55ZRZXAC

Mark all creatures summoned by god-given spell miscasts as god gifts.

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

Created by dolorous on June 9, 2008

64LQALS66EFDRQUEN3NRAWD2PWE7VMNRSEUTMRKQSEQTS55ZRZXAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1069 [5.293070]
[5.316027]
[6.130222]
```
    const bool god_gift = crawl_state.is_god_acting();
```

Replacement in crawl-ref/source/spl-cast.cc at line 1442 [5.293070]

B:BD[7.196] → [2.299:367]

        cast_summon_butterflies(powc, crawl_state.is_god_acting());

[7.196]

[8.161]

        cast_summon_butterflies(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1446 [5.293070]

B:BD[8.214] → [2.368:438]

        cast_summon_small_mammals(powc, crawl_state.is_god_acting());

[8.214]

[9.161]

        cast_summon_small_mammals(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1450 [5.293070]

B:BD[9.210] → [2.439:505]

        cast_sticks_to_snakes(powc, crawl_state.is_god_acting());

[9.210]

[10.200]

        cast_sticks_to_snakes(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1454 [5.293070]

B:BD[11.194] → [2.506:572]

        cast_summon_scorpions(powc, crawl_state.is_god_acting());

[11.194]

[10.254]

        cast_summon_scorpions(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1458 [5.293070]

B:BD[10.299] → [2.573:635]

        cast_summon_swarm(powc, crawl_state.is_god_acting());

[10.299]

[10.327]

        cast_summon_swarm(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1462 [5.293070]

B:BD[12.198] → [2.636:706]

        cast_call_canine_familiar(powc, crawl_state.is_god_acting());

[12.198]

[12.239]

        cast_call_canine_familiar(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1466 [5.293070]

B:BD[13.194] → [2.707:773]

        if (!summon_elemental(powc, crawl_state.is_god_acting()))

[13.194]

[13.231]

        if (!summon_elemental(powc, god_gift))

Replacement in crawl-ref/source/spl-cast.cc at line 1471 [5.293070]

B:BD[14.194] → [2.774:840]

        cast_summon_ice_beast(powc, crawl_state.is_god_acting());

[14.194]

[14.231]

        cast_summon_ice_beast(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1475 [5.293070]

B:BD[15.195] → [2.841:908]

        cast_summon_ugly_thing(powc, crawl_state.is_god_acting());

[15.195]

[16.239]

        cast_summon_ugly_thing(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1479 [5.293070]

B:BD[17.311] → [2.909:969]

        summon_guardian(powc, crawl_state.is_god_acting());

[17.311]

[18.256]

        summon_guardian(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1483 [5.293070]
B:BD[17.340] → [2.970:1027]
```
        summon_daeva(powc, crawl_state.is_god_acting());
```
[17.340]
[18.306]
```
        summon_daeva(powc, god_gift);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1487 [5.293070]

B:BD[19.223] → [2.1028:1091]

        cast_summon_dragon(powc, crawl_state.is_god_acting());

[19.223]

[20.161]

        cast_summon_dragon(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1491 [5.293070]

B:BD[20.216] → [2.1092:1164]

        cast_conjure_ball_lightning(powc, crawl_state.is_god_acting());

[20.216]

[21.161]

        cast_conjure_ball_lightning(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1496 [5.293070]

B:BD[22.304] → [2.1165:1228]

        cast_tukimas_dance(powc, crawl_state.is_god_acting());

[22.304]

[23.161]

        cast_tukimas_dance(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1500 [5.293070]
B:BD[23.202] → [2.1229:1287]
```
        cast_call_imp(powc, crawl_state.is_god_acting());
```
[23.202]
[23.231]
```
        cast_call_imp(powc, god_gift);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1504 [5.293070]

B:BD[23.276] → [2.1288:1350]

        cast_summon_demon(powc, crawl_state.is_god_acting());

[23.276]

[23.309]

        cast_summon_demon(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1508 [5.293070]

B:BD[23.355] → [2.1351:1414]

        cast_demonic_horde(powc, crawl_state.is_god_acting());

[23.355]

[23.389]

        cast_demonic_horde(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1512 [5.293070]

B:BD[23.442] → [2.1415:1485]

        cast_summon_greater_demon(powc, crawl_state.is_god_acting());

[23.442]

[24.161]

        cast_summon_greater_demon(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1516 [5.293070]

B:BD[24.210] → [2.1486:1546]

        cast_shadow_creatures(crawl_state.is_god_acting());

[24.210]

[25.161]

        cast_shadow_creatures(god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1520 [5.293070]

B:BD[26.317] → [2.1547:1619]

        cast_summon_horrible_things(powc, crawl_state.is_god_acting());

[26.317]

[2.1619]

        cast_summon_horrible_things(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1526 [5.293070]

B:BD[2.1802] → [2.1802:1873]

                         you.pet_target, crawl_state.is_god_acting());

[2.1802]

[2.1873]

                         you.pet_target, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1531 [5.293070]

B:BD[2.1972] → [2.1972:2090]

        animate_dead(&you, powc + 1, BEH_FRIENDLY, you.pet_target,
                     crawl_state.is_god_acting());

[2.1972]

[21.310]

        animate_dead(&you, powc + 1, BEH_FRIENDLY, you.pet_target, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1535 [5.293070]

B:BD[21.353] → [2.2091:2151]

        cast_simulacrum(powc, crawl_state.is_god_acting());

[21.353]

[27.161]

        cast_simulacrum(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1539 [5.293070]

B:BD[27.214] → [2.2152:2222]

        cast_twisted_resurrection(powc, crawl_state.is_god_acting());

[27.214]

[28.161]

        cast_twisted_resurrection(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1543 [5.293070]

B:BD[26.424] → [2.2223:2287]

        cast_summon_wraiths(powc, crawl_state.is_god_acting());

[26.424]

[25.256]

        cast_summon_wraiths(powc, god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 1547 [5.293070]

B:BD[25.302] → [2.2288:2351]

        cast_death_channel(powc, crawl_state.is_god_acting());

[25.302]

[5.328176]

        cast_death_channel(powc, god_gift);

Insertion in crawl-ref/source/spl-cast.cc at line 2319 [5.293070]
[29.7123]
[29.7123]
```
    const bool god_gift = crawl_state.is_god_acting();
```
Replacement in crawl-ref/source/spl-cast.cc at line 2375 [5.293070]
B:BD[29.8559] → [30.161:201]
```
            summon_spatial_vortices(0);
```
[29.8559]
[5.352784]
```
            summon_spatial_vortices(0, god_gift);
```

Replacement in crawl-ref/source/spl-cast.cc at line 2403 [5.293070]

∅:D[3.205] → [30.246:302]

B:BD[30.246] → [30.246:302]

            summon_spatial_vortices(75 + random2(151));

[3.205]

[5.356184]

            summon_spatial_vortices(75 + random2(151), god_gift);

Insertion in crawl-ref/source/spl-cast.cc at line 2439 [5.293070]

[29.10425]

    const bool god_gift = crawl_state.is_god_acting();
    const unsigned flags = (god_gift) ? MG_GOD_GIFT : 0;

Replacement in crawl-ref/source/spl-cast.cc at line 2493 [5.293070]
B:BD[29.11878] → [30.303:343]
```
            summon_spatial_vortices(0);
```
[29.11878]
[29.12058]
```
            summon_spatial_vortices(0, god_gift);
```

Replacement in crawl-ref/source/spl-cast.cc at line 2499 [5.293070]

B:BD[4.241] → [4.241:287]

                        you.pos(), 5)) != -1)

[4.241]

[29.12298]

                        you.pos(), 5, flags)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2514 [5.293070]

∅:D[3.250] → [30.388:444]

B:BD[30.388] → [30.388:444]

            summon_spatial_vortices(75 + random2(151));

[3.250]

[29.12655]

            summon_spatial_vortices(75 + random2(151), god_gift);

Replacement in crawl-ref/source/spl-cast.cc at line 2521 [5.293070]

B:BD[4.368] → [4.368:414]

                        you.pos(), 5)) != -1)

[4.368]

[29.12894]

                        you.pos(), 5, flags)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2539 [5.293070]

B:BD[4.631] → [4.631:677]

                        you.pos(), 5)) != -1)

[4.631]

[4.677]

                        you.pos(), 5, flags)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2560 [5.293070]
∅:D[31.553] → [32.3614:3657]
B:BD[32.3614] → [32.3614:3657]
```
                        you.pos())) != -1)
```
[31.553]
[5.363405]
```
                        you.pos(), 0, flags)) != -1)
```
Replacement in crawl-ref/source/spl-cast.cc at line 2571 [5.293070]
∅:D[31.635] → [32.3796:3839]
B:BD[32.3796] → [32.3796:3839]
```
                        you.pos())) != -1)
```
[31.635]
[5.364660]
```
                        you.pos(), 0, flags)) != -1)
```

Replacement in crawl-ref/source/spl-cast.cc at line 2587 [5.293070]

B:BD[31.957] → [4.1062:1108]

                        you.pos(), 3)) != -1)

[31.957]

[4.1108]

                        you.pos(), 3, flags)) != -1)

Insertion in crawl-ref/source/spl-cast.cc at line 2725 [5.293070]

[29.18213]

[5.366557]


    const bool god_gift = crawl_state.is_god_acting();
    const unsigned flags = (god_gift) ? MG_GOD_GIFT : 0;

Replacement in crawl-ref/source/spl-cast.cc at line 2811 [5.293070]

B:BD[30.480] → [3.251:305]

            summon_shadows(random2(61), false, true);

[30.480]

[29.20396]

            summon_shadows(random2(61), god_gift, true);

Replacement in crawl-ref/source/spl-cast.cc at line 2866 [5.293070]

B:BD[31.1404] → [31.1404:1450]

                        you.pos(), 4)) != -1)

[31.1404]

[29.21858]

                        you.pos(), 4, flags)) != -1)

Replacement in crawl-ref/source/spl-cast.cc at line 2877 [5.293070]

B:BD[31.1512] → [31.1512:1558]

                        you.pos(), 4)) != -1)

[31.1512]

[5.372290]

                        you.pos(), 4, flags)) != -1)