fiddlerwoaroof/crawl - Change YW5UVOSZFDRNHV5BCQ4JGP5CU3WFL4T3W5LRYX2NRVALQURONJ7QC

Go back to using the special damage message for draining monsters in

melee attacks, as the previous way could result in out-of-sequence messages. Keep the other message for draining beams and miscasts, though.

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

Created by dolorous on January 19, 2009

YW5UVOSZFDRNHV5BCQ4JGP5CU3WFL4T3W5LRYX2NRVALQURONJ7QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 7010 [5.962854]
B:BD[3.6498] → [4.2612:2647]
```
bool player::drain_exp(actor *who)
```
[3.6498]
[6.3830]
```
bool player::drain_exp(actor *who, bool quiet)
```
Replacement in crawl-ref/source/mon-util.cc at line 5896 [5.1699344]
B:BD[6.3913] → [4.2911:2950]
```
bool monsters::drain_exp(actor *agent)
```
[6.3913]
[6.3952]
```
bool monsters::drain_exp(actor *agent, bool quiet)
```

Replacement in crawl-ref/source/mon-util.cc at line 5901 [5.1699344]

B:BD[6.4002] → [7.2678:2735]

    if (mons_near(this) && player_monster_visible(this))

[6.4002]

[7.2735]

    if (!quiet && mons_near(this) && player_monster_visible(this))

Replacement in crawl-ref/source/mon-util.cc at line 6357 [5.1699344]
B:BD[8.5704] → [8.5704:5743]
```
        if (mons_near(this) && !quiet)
```
[8.5704]
[8.5743]
```
        if (!quiet && mons_near(this))
```
Replacement in crawl-ref/source/fight.cc at line 2059 [5.3140790]
∅:D[2.2839] → [4.3246:3285]
B:BD[4.3246] → [4.3246:3285]
```
    if (defender->drain_exp(attacker))
```
[2.2839]
[4.3285]
```
    if (defender->drain_exp(attacker, true))
```

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

[4.3371]

[9.4934]

        else if (defender_visible)
        {
            special_damage_message =
                make_stringf(
                    "%s %s %s!",
                    atk_name(DESC_CAP_THE).c_str(),
                    attacker->conj_verb("drain").c_str(),
                    def_name(DESC_NOCAP_THE).c_str());
        }

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

B:BD[10.2934] → [4.3489:3535]

    virtual bool drain_exp(actor *agent) = 0;

[10.2934]

[11.3340]

    virtual bool drain_exp(actor *agent, bool quiet = false) = 0;

Replacement in crawl-ref/source/externs.h at line 1078 [5.3270163]
B:BD[3.87136] → [4.3536:3565]
```
    bool drain_exp(actor *);
```
[3.87136]
[11.3412]
```
    bool drain_exp(actor *, bool quiet = false);
```
Replacement in crawl-ref/source/externs.h at line 1510 [5.3270163]
B:BD[12.6983] → [4.3566:3595]
```
    bool drain_exp(actor *);
```
[12.6983]
[11.3467]
```
    bool drain_exp(actor *, bool quiet = false);
```

Go back to using the special damage message for draining monsters in

Dependencies

In channels

Change contents

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

Replacement in crawl-ref/source/mon-util.cc at line 5896 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5901 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6357 [5.1699344]

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

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

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

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

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