fiddlerwoaroof/crawl - Change 3B3GZ4E2L4RIPHILKXACK4GF7DCQA5XC4UG75PHQXIVH4UCQWYAAC

Clean up the rotting routines a bit.

For the record, rotting attacks from monsters currently have the same problem that draining attacks used to, due to monsters::rot()'s directly modifying the monster's max HP, as well as its directly calling monsters::hurt().

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

Created by dolorous on January 8, 2009

3B3GZ4E2L4RIPHILKXACK4GF7DCQA5XC4UG75PHQXIVH4UCQWYAAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 6886 [5.962854]
B:BD[4.6451] → [4.6451:6496]
```
        disease_player( 50 + random2(100) );
```
[4.6451]
[6.7269]
```
        disease_player(50 + random2(100));
```

Insertion in crawl-ref/source/mon-util.cc at line 5790 [5.1699344]

[7.1557]


void monsters::rot(actor *atk, int rotlevel, int immed_rot)
{
    if (res_rotting() > 0)
        return;
    // Apply immediate damage because we can't handle rotting for
    // monsters yet.
    const int damage = immed_rot;
    if (damage > 0)
    {
        if (mons_near(this) && player_monster_visible(this))
        {
            mprf("%s %s!", name(DESC_CAP_THE).c_str(),
                 rotlevel == 0 ? "looks less resilient" : "rots");
        }
        hurt(atk, damage);
        if (alive())
        {
            max_hit_points -= immed_rot * 2;
            if (hit_points > max_hit_points)
                hit_points = max_hit_points;
        }
    }

Insertion in crawl-ref/source/mon-util.cc at line 5817 [5.1699344]

[7.1558]

[8.4882]

    if (rotlevel > 0)
    {
        add_ench(mon_enchant(ENCH_ROT, std::min(rotlevel, 4),
                             atk->kill_alignment()));
    }
}

Deletion in crawl-ref/source/mon-util.cc at line 5865 [5.1699344]
B:BD[4.15846] → [4.15846:15909]
∅:D[4.15909] → [6.10565:10567]
B:BD[6.10565] → [6.10565:10567]
B:BD[6.10567] → [9.2983:3010]
∅:D[9.3010] → [4.15953:15969]
B:BD[4.15953] → [4.15953:15969]
```
void monsters::rot(actor *agent, int rotlevel, int immed_rot)
{
    if (res_rotting() > 0)
        return;
```

Deletion in crawl-ref/source/mon-util.cc at line 5866 [5.1699344]

∅:D[10.2858] → [4.15974:16054]

B:BD[4.15974] → [4.15974:16054]

B:BD[4.16054] → [11.6803:6857]

∅:D[11.6857] → [4.16128:16195]

B:BD[4.16128] → [4.16128:16195]

B:BD[4.16195] → [12.6399:6464]

∅:D[12.6464] → [4.16267:16333]

B:BD[4.16267] → [4.16267:16333]

B:BD[4.16333] → [12.6465:6475]

∅:D[12.6475] → [4.16333:16544]

B:BD[4.16333] → [4.16333:16544]

B:BD[4.16544] → [11.6858:6881]

B:BD[11.6881] → [13.2778:2784]

B:BD[13.2784] → [3.2651:2769]

∅:D[3.2769] → [13.2785:2791]

B:BD[11.7001] → [13.2785:2791]

∅:D[13.2791] → [6.10567:10569]

∅:D[11.7001] → [6.10567:10569]

∅:D[4.16544] → [6.10567:10569]

B:BD[6.10567] → [6.10567:10569]

B:BD[6.10569] → [4.16545:16546]

    // Apply immediate damage because we can't handle rotting for monsters yet.
    const int damage = immed_rot;
    if (damage > 0)
    {
        if (mons_near(this) && player_monster_visible(this))
        {
            mprf("%s %s!", name(DESC_CAP_THE).c_str(),
                 rotlevel == 0? "looks less resilient" : "rots");
        }
        hurt(agent, damage);
        if (alive())
        {
            max_hit_points -= immed_rot * 2;
            if (hit_points > max_hit_points)
                hit_points = max_hit_points;
        }
    }
    if (rotlevel > 0)
    {
        add_ench(mon_enchant(ENCH_ROT, std::min(rotlevel, 4),
                             agent->kill_alignment()));
    }
}

Replacement in crawl-ref/source/externs.h at line 337 [5.3270163]

B:BD[14.2934] → [15.2854:2910]

B:BD[15.2910] → [8.6332:6439]

    virtual int hurt(const actor *attacker, int amount,
                     beam_type flavour = BEAM_MISSILE,
                     bool cleanup_dead = true) = 0;

[14.2934]

[4.84312]

    virtual void rot(actor *attacker, int rotlevel, int immed_rot) = 0;
    virtual int  hurt(const actor *attacker, int amount,
                      beam_type flavour = BEAM_MISSILE,
                      bool cleanup_dead = true) = 0;

Deletion in crawl-ref/source/externs.h at line 351 [5.3270163]
∅:D[2.6643] → [4.84712:84788]
B:BD[4.84712] → [4.84712:84788]
```
    virtual void rot(actor *attacker, int rotlevel, int immediate_rot) = 0;
```
Deletion in crawl-ref/source/externs.h at line 1073 [5.3270163]
∅:D[2.6796] → [4.87030:87087]
B:BD[4.87030] → [4.87030:87087]
```
    void rot(actor *agent, int rotlevel, int immed_rot);
```
Insertion in crawl-ref/source/externs.h at line 1074 [5.3270163]
[4.87136]
[15.2971]
```
    void rot(actor *attacker, int rotlevel, int immed_rot);
```
Replacement in crawl-ref/source/externs.h at line 1502 [5.3270163]
∅:D[2.6983] → [4.89292:89349]
B:BD[4.89292] → [4.89292:89349]
```
    void rot(actor *agent, int rotlevel, int immed_rot);
```
[2.6983]
[15.3126]
```
    void rot(actor *, int rotlevel, int immed_rot);
```

Clean up the rotting routines a bit.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.cc at line 6886 [5.962854]

Insertion in crawl-ref/source/mon-util.cc at line 5790 [5.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5817 [5.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 5865 [5.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 5866 [5.1699344]

Replacement in crawl-ref/source/externs.h at line 337 [5.3270163]

Deletion in crawl-ref/source/externs.h at line 351 [5.3270163]

Deletion in crawl-ref/source/externs.h at line 1073 [5.3270163]

Insertion in crawl-ref/source/externs.h at line 1074 [5.3270163]

Replacement in crawl-ref/source/externs.h at line 1502 [5.3270163]