fiddlerwoaroof/crawl - Change OHRWJKWAUQPMWIJZ6HC3Z2BX2KATS4PIH6UWSES227PB7Q72TNAAC

arena.cc: Make sure adjust_spells() gets all mons

Apply arena::adjust_spells() in arena_placed_monster() to make sure that it gets absolutely everything.

Created by Matthew Cline on October 21, 2009

OHRWJKWAUQPMWIJZ6HC3Z2BX2KATS4PIH6UWSES227PB7Q72TNAAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/arena.cc at line 137 [3.10815]

B:BD[3.11849] → [4.4060:4106]

∅:D[4.4106] → [3.11877:12060]

B:BD[3.11877] → [3.11877:12060]

B:BD[3.12060] → [4.4107:4176]

∅:D[5.3461] → [3.12378:12392]

∅:D[4.4176] → [3.12378:12392]

B:BD[3.12378] → [3.12378:12392]

B:BD[3.12392] → [6.11652:11663]

        if (!allow_summons || !allow_animate)
        {
            for (int m = 0; m < MAX_MONSTERS; ++m)
            {
                monsters *mons(&menv[m]);
                if (!mons->alive())
                    continue;
                adjust_spells(mons, !allow_summons, !allow_animate);
            }
        }

Insertion in crawl-ref/source/arena.cc at line 1161 [3.10815]

[7.3595]

[2.3469]


    if (!arena::allow_summons || !arena::allow_animate)
        arena::adjust_spells(monster, !arena::allow_summons,
                             !arena::allow_animate);

Replacement in crawl-ref/source/arena.cc at line 1218 [3.10815]

B:BD[4.6630] → [4.6630:6824]

        if (!arena::allow_chain_summons || !arena::allow_animate)
            arena::adjust_spells(monster, !arena::allow_chain_summons,
                                 !arena::allow_animate);

[4.6630]

[5.4271]

        if (!arena::allow_chain_summons)
            arena::adjust_spells(monster, true, false);