fiddlerwoaroof/crawl - Change W4HDISG44LF7QZC6SY3YM5OOXP36JREUIFWNYCN2OFAKRZFQUINQC

Consolidate the killer index sanity checks, and unbreak attacker

holiness checks (oops).

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

Created by dolorous on May 31, 2009

W4HDISG44LF7QZC6SY3YM5OOXP36JREUIFWNYCN2OFAKRZFQUINQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 1247 [4.1396662]
[3.3258]
[3.3258]
```
    const bool anon = (killer_index == ANON_FRIENDLY_MONSTER);
```

Deletion in crawl-ref/source/monstuff.cc at line 1249 [4.1396662]

B:BD[3.3318] → [3.3318:3447]

    const bool anon = (killer_index == ANON_FRIENDLY_MONSTER
                          || !invalid_monster_index(killer_index));

Replacement in crawl-ref/source/monstuff.cc at line 1261 [4.1396662]

B:BD[5.889] → [3.3448:3501]

                if (killer == KILL_YOU_CONF && anon)

[5.889]

[6.2934]

                if (killer == KILL_YOU_CONF
                    && (anon || !invalid_monster_index(killer_index)))

Replacement in crawl-ref/source/monstuff.cc at line 1441 [4.1396662]

B:BD[7.2685] → [3.3973:4032]

            if (!created_friendly && gives_xp && pet_kill)

[7.2685]

[4.1413520]

            if (!created_friendly && gives_xp && pet_kill
                && !invalid_monster_index(killer_index))

Insertion in crawl-ref/source/monstuff.cc at line 1446 [4.1396662]
[8.414008]
[3.4033]
```
                monsters *attacker = &menv[killer_index];
```

Replacement in crawl-ref/source/monstuff.cc at line 1448 [4.1396662]

B:BD[3.4085] → [3.4085:4161]

                    anon ? MH_NATURAL : mons_holiness(&menv[killer_index]);

[3.4085]

[4.1413592]

                    anon ? MH_NATURAL : mons_holiness(attacker);

Replacement in crawl-ref/source/monstuff.cc at line 1456 [4.1396662]

B:BD[9.3015] → [9.3015:3086]

                    || !anon && mons_is_god_gift(&menv[killer_index]))

[9.3015]

[4.1413655]

                    || !anon && mons_is_god_gift(attacker))

Replacement in crawl-ref/source/monstuff.cc at line 1460 [4.1396662]

B:BD[10.13882] → [2.3809:3920]

                        const bool confused =
                            !mons_friendly(&menv[killer_index]);

[10.13882]

[2.3920]

                        const bool confused = !mons_friendly(attacker);

Replacement in crawl-ref/source/monstuff.cc at line 1534 [4.1396662]

∅:D[9.5589] → [11.7239:7303]

B:BD[11.7239] → [11.7239:7303]

                        if (mons_friendly(&menv[killer_index]))

[9.5589]

[11.7303]

                        if (mons_friendly(attacker))

Replacement in crawl-ref/source/monstuff.cc at line 1570 [4.1396662]

B:BD[12.4743] → [12.4743:4808]

B:BD[12.4808] → [13.75667:75728]

                    && random2(you.piety) >= piety_breakpoint(0)
                    && !invalid_monster_index(killer_index))

[12.4743]

[14.5066]

                    && random2(you.piety) >= piety_breakpoint(0))

Deletion in crawl-ref/source/monstuff.cc at line 1572 [4.1396662]
B:BD[14.5084] → [13.75729:75786]
∅:D[13.75786] → [15.2593:2594]
B:BD[14.5130] → [15.2593:2594]
```
                    monsters *mon = &menv[killer_index];
```

Replacement in crawl-ref/source/monstuff.cc at line 1573 [4.1396662]

B:BD[15.2657] → [16.5340:5446]

                    if (!one_chance_in(3) && mon->alive()
                        && bless_follower(mon))

[15.2657]

[16.5446]

                    if (!one_chance_in(3) && attacker->alive()
                        && bless_follower(attacker))

Replacement in crawl-ref/source/monstuff.cc at line 1579 [4.1396662]

B:BD[17.3171] → [17.3171:3250]

                    if (mon->alive() && mon->hit_points < mon->max_hit_points)

[17.3171]

[14.5193]

                    if (attacker->alive()
                        && attacker->hit_points < attacker->max_hit_points)

Replacement in crawl-ref/source/monstuff.cc at line 1582 [4.1396662]

B:BD[14.5215] → [18.2542:2618]

B:BD[18.2618] → [3.4238:4361]

                        simple_monster_message(mon, " looks invigorated.");
                        heal_monster(mon, 1 + random2(monster->hit_dice / 4),
                                     false);

[14.5215]

[14.5503]

                        simple_monster_message(attacker, " looks invigorated.");
                        heal_monster(attacker,
                                     1 + random2(monster->hit_dice / 4), false);

Replacement in crawl-ref/source/monstuff.cc at line 1592 [4.1396662]

∅:D[12.5033] → [19.3648:3689]

B:BD[19.3648] → [19.3648:3689]

B:BD[19.3689] → [13.75787:75848]

                    && !one_chance_in(3)
                    && !invalid_monster_index(killer_index))

[12.5033]

[20.3664]

                    && !one_chance_in(3))

Replacement in crawl-ref/source/monstuff.cc at line 1594 [4.1396662]

B:BD[20.3682] → [13.75849:75906]

                    bless_follower(&menv[killer_index]);

[20.3682]

[14.5525]

                    bless_follower(attacker);