fiddlerwoaroof/crawl - Change JM36UF5EFWQLT44YSLFAUM7IGILCC6WZHOBJOEL3HWIXGYLJRRXAC

If monsters::hurt() is called on a monster that's already dead, but

cleanup_dead is true, do the cleanup.

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

Created by dolorous on January 8, 2009

JM36UF5EFWQLT44YSLFAUM7IGILCC6WZHOBJOEL3HWIXGYLJRRXAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 5794 [4.1699344]

B:BD[3.15495] → [2.2634:2713]

    // Already dead?
    if (hit_points < 1 || type == -1)
        return (0);

[3.15495]

[2.2713]

    if (hit_points > 0 && type != -1)
    {
        if (amount == INSTANT_DEATH)
            amount = hit_points;
        else if (hit_dice <= 0)
            amount = hit_points;
        else if (amount <= 0 && hit_points <= max_hit_points)
            return (0);

Replacement in crawl-ref/source/mon-util.cc at line 5803 [4.1699344]

∅:D[2.2714] → [5.4991:5053]

B:BD[3.15495] → [5.4991:5053]

B:BD[5.5053] → [2.2715:2829]

∅:D[2.2829] → [6.2723:2743]

∅:D[5.5079] → [6.2723:2743]

B:BD[3.15516] → [6.2723:2743]

    if (amount == INSTANT_DEATH)
        amount = hit_points;
    else if (hit_dice < 1)
        amount = hit_points;
    else if (amount <= 0 && hit_points <= max_hit_points)
        return (0);

[2.2714]

[6.2743]

        amount = std::min(amount, hit_points);
        hit_points -= amount;

Replacement in crawl-ref/source/mon-util.cc at line 5806 [4.1699344]

B:BD[6.2744] → [6.2744:2787]

∅:D[6.2787] → [3.15537:15563]

B:BD[3.15537] → [3.15537:15563]

    amount = std::min(amount, hit_points);
    hit_points -= amount;

[6.2744]

[7.11737]

        if (hit_points > max_hit_points)
        {
            amount    += hit_points - max_hit_points;
            hit_points = max_hit_points;
        }

Replacement in crawl-ref/source/mon-util.cc at line 5812 [4.1699344]

B:BD[7.11738] → [2.2830:2960]

    if (hit_points > max_hit_points)
    {
        amount    += hit_points - max_hit_points;
        hit_points = max_hit_points;

[7.11738]

[2.2960]

        // Allow the victim to exhibit passive damage behaviour (royal
        // jelly).
        react_to_damage(amount, flavour);

Replacement in crawl-ref/source/mon-util.cc at line 5817 [4.1699344]
∅:D[2.2967] → [6.2793:2868]
∅:D[7.11738] → [6.2793:2868]
B:BD[6.2793] → [6.2793:2868]
B:BD[6.2868] → [8.2591:2629]
∅:D[8.2629] → [7.11739:11740]
B:BD[6.2897] → [7.11739:11740]
B:BD[7.11740] → [5.5080:5152]
```
    // Allow the victim to exhibit passive damage behaviour (royal jelly).
    react_to_damage(amount, flavour);
    if (cleanup_dead && (hit_points < 1 || hit_dice < 1) && type != -1)
```
[2.2967]
[3.15619]
```
    if (cleanup_dead && (hit_points <= 0 || hit_dice <= 0) && type != -1)
```