fiddlerwoaroof/crawl - Change 2KKHQWC5ML42HRY3UCOOEU7CUKAZMPDDD35OARA6HVXU4GDJ3P4QC

Clean up rotting routines again.

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

Created by dolorous on January 8, 2009

2KKHQWC5ML42HRY3UCOOEU7CUKAZMPDDD35OARA6HVXU4GDJ3P4QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 3887 [4.293070]
B:BD[3.786] → [3.786:800]
```
            {
```
Deletion in crawl-ref/source/spl-cast.cc at line 3888 [4.293070]
∅:D[3.869] → [5.21091:21105]
B:BD[4.370835] → [5.21091:21105]
```
            }
```

Replacement in crawl-ref/source/spl-cast.cc at line 3891 [4.293070]

B:BD[5.21214] → [6.42195:42257]

            target->rot(act_source, random2avg(7, 2) + 1, 0);

[5.21214]

[6.42257]

            target->rot(act_source, random2avg(7, 2) + 1);

Replacement in crawl-ref/source/player.cc at line 6874 [4.962854]

B:BD[7.6215] → [7.6215:6273]

void player::rot(actor *who, int rotlevel, int immed_rot)

[7.6215]

[7.6273]

void player::rot(actor *who, int amount, int immediate)

Replacement in crawl-ref/source/player.cc at line 6876 [4.962854]
B:BD[7.6275] → [8.2829:2856]
```
    if (res_rotting() > 0)
```
[7.6275]
[9.2619]
```
    if (res_rotting() > 0 || amount <= 0)
```
Replacement in crawl-ref/source/player.cc at line 6879 [4.962854]
∅:D[9.2642] → [7.6311:6329]
B:BD[7.6311] → [7.6311:6329]
B:BD[7.6329] → [9.2643:2674]
∅:D[9.2674] → [7.6366:6412]
B:BD[7.6366] → [7.6366:6412]
```
    if (rotlevel)
        rot_player(rotlevel);
    if (immed_rot)
        rot_hp(immed_rot);
```
[9.2642]
[7.6412]
```
    if (immediate)
        rot_hp(immediate);
```
Replacement in crawl-ref/source/player.cc at line 6882 [4.962854]
B:BD[7.6413] → [7.6413:6451]
```
    if (rotlevel && one_chance_in(4))
```
[7.6413]
[2.2610]
```
    if (one_chance_in(4))
```

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

B:BD[2.2685] → [2.2685:2745]

void monsters::rot(actor *atk, int rotlevel, int immed_rot)

[2.2685]

[2.2745]

void monsters::rot(actor *agent, int amount, int immediate)

Replacement in crawl-ref/source/mon-util.cc at line 5793 [4.1699344]
B:BD[2.2747] → [2.2747:2774]
```
    if (res_rotting() > 0)
```
[2.2747]
[2.2774]
```
    if (res_rotting() > 0 || amount <= 0)
```
Replacement in crawl-ref/source/mon-util.cc at line 5798 [4.1699344]
B:BD[2.2878] → [2.2878:2932]
```
    const int damage = immed_rot;
    if (damage > 0)
```
[2.2878]
[2.2932]
```
    if (immediate > 0)
```

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

B:BD[2.3064] → [2.3064:3131]

                 rotlevel == 0 ? "looks less resilient" : "rots");

[2.3064]

[2.3131]

                 amount > 0 ? "rots" : "looks less resilient");

Replacement in crawl-ref/source/mon-util.cc at line 5806 [4.1699344]
B:BD[2.3142] → [2.3142:3169]
```
        hurt(atk, damage);
```
[2.3142]
[2.3169]
```
        hurt(agent, immediate);
```
Replacement in crawl-ref/source/mon-util.cc at line 5810 [4.1699344]
B:BD[2.3201] → [2.3201:3246]
```
            max_hit_points -= immed_rot * 2;
```
[2.3201]
[2.3246]
```
            max_hit_points -= immediate * 2;
```

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

B:BD[10.1558] → [2.3353:3503]

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

[10.1558]

[2.3503]

    add_ench(mon_enchant(ENCH_ROT, std::min(amount, 4),
                         agent->kill_alignment()));

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

B:BD[11.2934] → [2.3592:3664]

    virtual void rot(actor *attacker, int rotlevel, int immed_rot) = 0;

[11.2934]

[2.3664]

    virtual void rot(actor *agent, int amount, int immediate = 0) = 0;

Replacement in crawl-ref/source/externs.h at line 1074 [4.3270163]

B:BD[7.87136] → [2.3831:3891]

    void rot(actor *attacker, int rotlevel, int immed_rot);

[7.87136]

[12.2971]

    void rot(actor *, int amount, int immediate = 0);

Replacement in crawl-ref/source/externs.h at line 1502 [4.3270163]
B:BD[13.6983] → [2.3892:3944]
```
    void rot(actor *, int rotlevel, int immed_rot);
```
[13.6983]
[12.3126]
```
    void rot(actor *, int amount, int immediate = 0);
```

Clean up rotting routines again.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/spl-cast.cc at line 3887 [4.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 3888 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3891 [4.293070]

Replacement in crawl-ref/source/player.cc at line 6874 [4.962854]

Replacement in crawl-ref/source/player.cc at line 6876 [4.962854]

Replacement in crawl-ref/source/player.cc at line 6879 [4.962854]

Replacement in crawl-ref/source/player.cc at line 6882 [4.962854]

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/externs.h at line 1074 [4.3270163]

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