fiddlerwoaroof/crawl - Change S3AAI5UNOZ72DWBQ4QZQ2IODUI6ZC5X2RIPAPNZ7CPQCIAAT7EKQC

Refix [2484631], in a way that won't require changes to draining or

rotting attacks: Put the draining attack code back where it was, and instead explicitly check for a death-by-banishment when determining whether to skip chaos_killed_defender(). Sorry for any confusion.

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

Created by dolorous on January 8, 2009

S3AAI5UNOZ72DWBQ4QZQ2IODUI6ZC5X2RIPAPNZ7CPQCIAAT7EKQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/fight.h at line 173 [5.3139131]
[4.26546]
[4.26546]
```
    bool is_banished(const actor *) const;
```

Replacement in crawl-ref/source/fight.cc at line 426 [5.3140790]

B:BD[6.2122] → [7.1096:1150]

        return (actor_invisible? "It" : "Something");

[6.2122]

[6.2145]

        return (actor_invisible ? "It" : "Something");

Insertion in crawl-ref/source/fight.cc at line 479 [5.3140790]

[8.6729]

[6.2643]

}
bool melee_attack::is_banished(const actor *defn) const
{
    if (!defn)
        return (false);
    if (defn->atype() == ACT_PLAYER)
        return (you.banished);
    else
        return (def->flags & MF_BANISHED);

Insertion in crawl-ref/source/fight.cc at line 2070 [5.3140790]

[9.557]

[10.4495]

    }
    if (one_chance_in(5))
    {
        def->hit_dice--;
        def->experience = 0;

Insertion in crawl-ref/source/fight.cc at line 2077 [5.3140790]

[10.4501]

[11.4934]


    def->max_hit_points -= 2 + random2(3);
    def->hurt(attacker, 2 + random2(3), BEAM_NEG, false);

Deletion in crawl-ref/source/fight.cc at line 4566 [5.3140790]

B:BD[12.78220] → [3.2724:2937]


        const bool draining_attack = damage_brand == SPWPN_DRAINING
                                         || (attk.flavour == AF_DRAIN_XP
                                             && attacker != defender);

Replacement in crawl-ref/source/fight.cc at line 4666 [5.3140790]
∅:D[13.2797] → [8.21505:21541]
∅:D[2.2813] → [8.21505:21541]
∅:D[14.3599] → [8.21505:21541]
B:BD[8.21505] → [8.21505:21541]
```
            if (!defender->alive())
```
[2.2813]
[8.21541]
```
            if (!defender->alive() && is_banished(defender))
```

Deletion in crawl-ref/source/fight.cc at line 4673 [5.3140790]

B:BD[8.21711] → [8.21711:21726]

B:BD[8.21726] → [3.2938:3299]

            }
            if (draining_attack && defender->atype() == ACT_MONSTER)
            {
                if (one_chance_in(5))
                {
                    def->hit_dice--;
                    def->experience = 0;
                }
                def->max_hit_points -= 2 + random2(3);
                def->hurt(attacker, 2 + random2(3), BEAM_NEG, false);