fiddlerwoaroof/crawl - Change GDAP46HZY4L5ANBOXI36M2OAIXFT7I7DEVB4C5RUEYEXYOTCKO5AC

Clean up monster_die(): Add killer index sanity checks, and save monster

friendliness, holiness, and anonymity in variables instead of manually accessing them twice.

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

Created by dolorous on May 31, 2009

GDAP46HZY4L5ANBOXI36M2OAIXFT7I7DEVB4C5RUEYEXYOTCKO5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 1205 [9.1396662]

B:BD[7.2635] → [8.2567:2700]

            simple_monster_message( monster, " vapourises!",
                                    MSGCH_MONSTER_DAMAGE,  MDAM_DEAD );

[7.2635]

[10.2596]

            simple_monster_message(monster, " vapourises!",
                                   MSGCH_MONSTER_DAMAGE,  MDAM_DEAD);

Insertion in crawl-ref/source/monstuff.cc at line 1215 [9.1396662]
[6.2750]
[11.2569]

Replacement in crawl-ref/source/monstuff.cc at line 1232 [9.1396662]

B:BD[12.2610] → [13.2567:2715]

                simple_monster_message( monster, " falls from the air.",
                                        MSGCH_MONSTER_DAMAGE, MDAM_DEAD );

[12.2610]

[10.2624]

                simple_monster_message(monster, " falls from the air.",
                                       MSGCH_MONSTER_DAMAGE, MDAM_DEAD);

Replacement in crawl-ref/source/monstuff.cc at line 1241 [9.1396662]

∅:D[14.2728] → [15.3277:3354]

B:BD[16.2615] → [15.3277:3354]

B:BD[15.3354] → [3.2628:2741]

    bool death_message = !silent && !did_death_message && mons_near(monster)
                         && (player_monster_visible(monster)
                             || crawl_state.arena);

[14.2728]

[10.2757]

    const bool death_message = !silent && !did_death_message
                                   && mons_near(monster)
                                   && (player_monster_visible(monster)
                                       || crawl_state.arena);
    const bool created_friendly = testbits(monster->flags, MF_CREATED_FRIENDLY);
    const mon_holy_type targ_holy = mons_holiness(monster);
    const bool anon = (killer_index == ANON_FRIENDLY_MONSTER
                          || !invalid_monster_index(killer_index));

Deletion in crawl-ref/source/monstuff.cc at line 1259 [9.1396662]
∅:D[17.3193] → [18.2702:2744]
∅:D[19.7461] → [18.2702:2744]
B:BD[20.243842] → [18.2702:2744]
∅:D[18.2744] → [21.3037:3100]
B:BD[21.3037] → [21.3037:3100]
```
            const bool created_friendly =
                testbits(monster->flags, MF_CREATED_FRIENDLY);
```

Replacement in crawl-ref/source/monstuff.cc at line 1262 [9.1396662]

B:BD[22.889] → [23.2677:2886]

B:BD[23.2886] → [24.4131:4132]

B:BD[24.4132] → [5.3843:3872]

                bool passive = (killer == KILL_YOU_CONF
                                && (killer_index == ANON_FRIENDLY_MONSTER
                                    || !invalid_monster_index(killer_index)));
                if (passive)

[22.889]

[23.2934]

                if (killer == KILL_YOU_CONF && anon)

Replacement in crawl-ref/source/monstuff.cc at line 1290 [9.1396662]

B:BD[9.1410009] → [25.5703:5761]

                if (mons_holiness(monster) == MH_NATURAL)

[9.1410009]

[26.4398]

                if (targ_holy == MH_NATURAL)

Insertion in crawl-ref/source/monstuff.cc at line 1294 [9.1396662]

[27.4005]

[26.4417]


                    if (mons_is_evil(monster))
                    {
                        did_god_conduct(DID_KILL_NATURAL_EVIL,
                                        monster->hit_dice, true, monster);
                    }

Replacement in crawl-ref/source/monstuff.cc at line 1301 [9.1396662]
∅:D[27.4005] → [9.1410215:1410216]
∅:D[26.4435] → [9.1410215:1410216]
∅:D[25.5870] → [9.1410215:1410216]
∅:D[28.412791] → [9.1410215:1410216]
B:BD[9.1410215] → [9.1410215:1410216]
B:BD[9.1410216] → [25.5871:5928]
```
                if (mons_holiness(monster) == MH_UNDEAD)
```
[26.4435]
[26.4436]
```
                else if (targ_holy == MH_UNDEAD)
```
Replacement in crawl-ref/source/monstuff.cc at line 1306 [9.1396662]
∅:D[27.4077] → [9.1410499:1410500]
∅:D[26.4473] → [9.1410499:1410500]
∅:D[25.6037] → [9.1410499:1410500]
∅:D[28.412981] → [9.1410499:1410500]
B:BD[9.1410499] → [9.1410499:1410500]
B:BD[9.1410500] → [25.6038:6096]
```
                if (mons_holiness(monster) == MH_DEMONIC)
```
[26.4473]
[26.4474]
```
                else if (targ_holy == MH_DEMONIC)
```

Deletion in crawl-ref/source/monstuff.cc at line 1309 [9.1396662]

B:BD[25.6148] → [27.4078:4149]

B:BD[27.4149] → [26.4493:4511]

∅:D[27.4149] → [29.260:261]

∅:D[26.4511] → [29.260:261]

B:BD[29.260] → [29.260:261]

B:BD[29.261] → [30.2687:2729]

∅:D[30.2729] → [31.4195:4274]

B:BD[31.4195] → [31.4195:4274]

∅:D[31.4274] → [29.321:380]

B:BD[29.321] → [29.321:380]

                                    monster->hit_dice, true, monster);
                }
                if (mons_is_evil(monster)
                    && mons_holiness(monster) == MH_NATURAL)
                {
                    did_god_conduct(DID_KILL_NATURAL_EVIL,

Replacement in crawl-ref/source/monstuff.cc at line 1333 [9.1396662]

∅:D[32.2653] → [33.2747:2790]

B:BD[28.413569] → [33.2747:2790]

                if (mons_is_holy(monster))

[28.413569]

[32.2654]

                // Holy kills are always noticed.
                if (targ_holy == MH_HOLY)

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

∅:D[34.2685] → [21.3322:3426]

B:BD[9.1413444] → [21.3322:3426]

            if (!testbits(monster->flags, MF_CREATED_FRIENDLY) && gives_xp
                && pet_kill)

[34.2685]

[9.1413520]

            if (!created_friendly && gives_xp && pet_kill)

Deletion in crawl-ref/source/monstuff.cc at line 1444 [9.1396662]
B:BD[28.414005] → [35.75315:75390]
```
                const bool anon = (killer_index == ANON_FRIENDLY_MONSTER);
```

Replacement in crawl-ref/source/monstuff.cc at line 1445 [9.1396662]

B:BD[28.414008] → [36.2568:2640]

B:BD[36.2640] → [35.75391:75524]

                const mon_holy_type targ_holy = mons_holiness(monster),
                    attacker_holy = anon ? MH_NATURAL
                                         : mons_holiness(&menv[killer_index]);

[28.414008]

[9.1413592]

                const mon_holy_type attacker_holy =
                    anon ? MH_NATURAL : mons_holiness(&menv[killer_index]);

Replacement in crawl-ref/source/monstuff.cc at line 1562 [9.1396662]

B:BD[28.416908] → [28.416908:416985]

                        inc_mp( 1 + random2(monster->hit_dice / 2), false );

[28.416908]

[28.416985]

                        inc_mp(1 + random2(monster->hit_dice / 2), false);

Replacement in crawl-ref/source/monstuff.cc at line 1584 [9.1396662]

∅:D[2.2618] → [21.3762:3888]

∅:D[37.2619] → [21.3762:3888]

B:BD[21.3762] → [21.3762:3888]

                        heal_monster( mon, 1 + random2(monster->hit_dice / 4),
                                      false );

[2.2618]

[31.5503]

                        heal_monster(mon, 1 + random2(monster->hit_dice / 4),
                                     false);

Deletion in crawl-ref/source/monstuff.cc at line 1598 [9.1396662]
B:BD[31.5543] → [38.3801:3802]

Replacement in crawl-ref/source/monstuff.cc at line 1631 [9.1396662]

B:BD[39.1322] → [39.1322:1381]

            monster->set_transit( level_id(LEVEL_ABYSS) );

[39.1322]

[39.1381]

            monster->set_transit(level_id(LEVEL_ABYSS));

Replacement in crawl-ref/source/monstuff.cc at line 1728 [9.1396662]
B:BD[40.2940] → [40.2940:2975]
```
        // don't clutter up mitm[]
```
[40.2940]
[4.2821]
```
        // don't clutter up mitm[].
```