fiddlerwoaroof/crawl - Change OIT7AR4IL2ZH4ISWXG3Y7Y24ICNQ5WSUFJLSUIYD7P5VGYU5BJLQC

Fix mephitic cloud allowing no self-targetting. (BR1995505)

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

Created by j-p-e-g on June 17, 2008

OIT7AR4IL2ZH4ISWXG3Y7Y24ICNQ5WSUFJLSUIYD7P5VGYU5BJLQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-util.cc at line 773 [6.245665]
[4.942]
[5.118843]
```
        mpr("user canceled");
```

Deletion in crawl-ref/source/spells1.cc at line 563 [6.616635]

∅:D[5.158816] → [6.625497:625498]

B:BD[6.625497] → [6.625497:625498]

B:BD[6.625498] → [3.2596:2862]

∅:D[3.2862] → [6.625498:625519]

B:BD[6.625498] → [6.625498:625519]


    // Fire tracer.
    beem.source_x      = you.x_pos;
    beem.source_y      = you.y_pos;
    beem.can_see_invis = player_see_invis();
    beem.smart_monster = true;
    beem.attitude      = ATT_FRIENDLY;
    beem.fr_count      = 0;
    beem.is_tracer     = true;
    fire_beam(beem);

Replacement in crawl-ref/source/spells1.cc at line 564 [6.616635]

B:BD[5.158818] → [3.2863:2890]

    if (beem.fr_count > 0)

[5.158818]

[3.2890]

    // Don't bother tracing if you're targetting yourself.
    if (beem.target_x != you.x_pos || beem.target_y != you.y_pos)

Replacement in crawl-ref/source/spells1.cc at line 567 [6.616635]

B:BD[3.2896] → [3.2896:3001]

        // We don't want to fire through friendlies.
        canned_msg(MSG_OK);
        return (false);

[3.2896]

[3.3001]

        // Fire tracer.
        beem.source_x      = you.x_pos;
        beem.source_y      = you.y_pos;
        beem.can_see_invis = player_see_invis();
        beem.smart_monster = true;
        beem.attitude      = ATT_FRIENDLY;
        beem.fr_count      = 0;
        beem.is_tracer     = true;
        fire_beam(beem);
        if (beem.fr_count > 0)
        {
            // We don't want to fire through friendlies.
            canned_msg(MSG_OK);
            return (false);
        }

Insertion in crawl-ref/source/directn.cc at line 963 [6.3697945]
[7.1425]
[2.167]
```
                mpr("not self-targetting");
```

Replacement in crawl-ref/source/beam.cc at line 3620 [6.4128068]

B:BD[8.32741] → [8.32741:32786]

        if (beam.thrower != KILL_YOU_MISSILE

[8.32741]

[8.32786]

        if (beam.thrower != KILL_YOU_MISSILE && beam.thrower != KILL_YOU