fiddlerwoaroof/crawl - Change GNVJ7ESHE4IPEZCRTBTHUQXSZWWKXLOU76G3XSTEAURMI4JCPLMAC

Clean up routines for monsters' avoiding death again.

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

Created by dolorous on January 27, 2009

GNVJ7ESHE4IPEZCRTBTHUQXSZWWKXLOU76G3XSTEAURMI4JCPLMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 577 [7.1396662]
∅:D[5.3109] → [6.3627:3677]
B:BD[6.3627] → [6.3627:3677]
```
static bool _ely_protects_ally(monsters *monster)
```
[5.3109]
[6.3677]
```
static bool _ely_protect_ally(monsters *monster)
```
Replacement in crawl-ref/source/monstuff.cc at line 606 [7.1396662]
∅:D[2.2673] → [8.3608:3685]
∅:D[6.4425] → [8.3608:3685]
B:BD[9.4907] → [8.3608:3685]
```
static bool _ely_heals_monster(monsters *monster, killer_type killer, int i)
```
[2.2673]
[9.4983]
```
static bool _ely_heal_monster(monsters *monster, killer_type killer, int i)
```

Replacement in crawl-ref/source/monstuff.cc at line 657 [7.1396662]

B:BD[9.6305] → [5.3459:3530]

static bool _yred_enslaves_soul(monsters *monster, killer_type killer)

[9.6305]

[5.3530]

static bool _yred_enslave_soul(monsters *monster, killer_type killer)

Replacement in crawl-ref/source/monstuff.cc at line 670 [7.1396662]

∅:D[5.3828] → [8.3686:3767]

B:BD[9.6305] → [8.3686:3767]

static bool _monster_avoided_death(monsters *monster, killer_type killer, int i)

[5.3828]

[10.3590]

static bool _beogh_forcibly_convert_orc(monsters *monster, killer_type killer,
                                        int i)

Deletion in crawl-ref/source/monstuff.cc at line 673 [7.1396662]
B:BD[10.3592] → [10.3592:3758]
B:BD[10.3758] → [9.6306:6312]
∅:D[9.6312] → [10.3758:3782]
B:BD[10.3758] → [10.3758:3782]
B:BD[10.3782] → [9.6313:6319]
∅:D[9.6319] → [10.3782:3783]
B:BD[10.3782] → [10.3782:3783]
B:BD[10.3783] → [3.2637:2663]
∅:D[3.2663] → [5.3829:3937]
B:BD[6.4575] → [5.3829:3937]
∅:D[5.3937] → [6.4644:4668]
B:BD[6.4644] → [6.4644:4668]
B:BD[6.4668] → [3.2664:2692]
∅:D[3.2692] → [5.3965:4011]
B:BD[5.3965] → [5.3965:4011]
∅:D[5.4011] → [9.6442:6465]
∅:D[6.4748] → [9.6442:6465]
B:BD[9.6442] → [9.6442:6465]
B:BD[9.6471] → [11.2635:2636]
B:BD[11.2636] → [3.2693:2715]
```
    if (monster->hit_points < -25
        || monster->hit_points < -monster->max_hit_points
        || monster->max_hit_points <= 0
        || monster->hit_dice < 1)
    {
        return (false);
    }
    // Elyvilon specials.
    if (_ely_protects_ally(monster))
        return (true);
    if (_ely_heals_monster(monster, killer, i))
        return (true);
    // Yredelemnul special.
    if (_yred_enslaves_soul(monster, killer))
        return (true);
    // Beogh special.
```

Insertion in crawl-ref/source/monstuff.cc at line 717 [7.1396662]

[12.2632]

[13.2545]

static bool _monster_avoided_death(monsters *monster, killer_type killer, int i)
{
    if (monster->hit_points < -25
        || monster->hit_points < -monster->max_hit_points
        || monster->max_hit_points <= 0
        || monster->hit_dice < 1)
    {
        return (false);
    }
    // Elyvilon specials.
    if (_ely_protect_ally(monster))
        return (true);
    if (_ely_heal_monster(monster, killer, i))
        return (true);
    // Yredelemnul special.
    if (_yred_enslave_soul(monster, killer))
        return (true);
    // Beogh special.
    if (_beogh_forcibly_convert_orc(monster, killer, i))
        return (true);
    return (false);
}

Replacement in crawl-ref/source/monstuff.cc at line 7788 [7.1396662]

B:BD[4.2748] → [4.2748:2803]

            if (!_yred_enslaves_soul(monster, killer))

[4.2748]

[4.2803]

            if (!_yred_enslave_soul(monster, killer))