fiddlerwoaroof/crawl - Change H55P74Y6NHAPF3VPWXIAP7DODA3DV7NCT3SK6VVLWNNWZ7JIMBTAC

Improve halo-related output.

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

Created by dolorous on April 18, 2008

H55P74Y6NHAPF3VPWXIAP7DODA3DV7NCT3SK6VVLWNNWZ7JIMBTAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 483 [7.804403]
B:BD[5.2743] → [6.2593:2624]
```
            if (halo_radius())
```
[5.2743]
[4.2574]
```
            if (you.haloed())
```
Replacement in crawl-ref/source/religion.cc at line 3904 [7.804403]
B:BD[6.2786] → [6.2786:2827]
```
    const bool old_halo = halo_radius();
```
[6.2786]
[8.2617]
```
    const bool was_haloed = you.haloed();
```
Replacement in crawl-ref/source/religion.cc at line 4003 [7.804403]
B:BD[6.2829] → [6.2829:2851]
```
        if (old_halo)
```
[9.4009]
[4.2686]
```
        if (was_haloed)
```

Insertion in crawl-ref/source/player.cc at line 3661 [7.962854]

[7.1030876]

[10.4960]


    if (you.haloed())
        mpr( "You are illuminated by a halo." );

Replacement in crawl-ref/source/player.cc at line 6431 [7.962854]
B:BD[11.268] → [3.2651:2695]
```
bool player::backlit(bool check_halo) const
```
[11.268]
[11.297]
```
bool player::backlit(bool check_haloed) const
```

Replacement in crawl-ref/source/player.cc at line 6434 [7.962854]

B:BD[3.2760] → [3.2760:2812]

        || ((check_halo) ? halo_radius() : false));

[3.2760]

[12.55]

        || ((check_haloed) ? haloed() : false));
}
bool player::haloed() const
{
    return (halo_radius());

Replacement in crawl-ref/source/output.cc at line 740 [7.1088282]

B:BD[7.1096563] → [3.2819:2929]

    // Don't display "Glow" for a visible player inside a halo.
    if (you.backlit(you.duration[DUR_INVIS]))

[7.1096563]

[13.13928]

    if (you.backlit())

Replacement in crawl-ref/source/output.cc at line 742 [7.1088282]

B:BD[13.13934] → [2.11124:11315]

        int color = you.magic_contamination > 5
            ? _bad_ench_colour( you.magic_contamination, 15, 25 )
            : LIGHTBLUE;
        out.push_back(status_light(color, "Glow"));

[13.13934]

[7.1096703]

        if (!you.backlit(false) && you.haloed())
            out.push_back(status_light(LIGHTBLUE, "Halo"));
        else
        {
            int color = you.magic_contamination > 5
                ? _bad_ench_colour( you.magic_contamination, 15, 25 )
                : LIGHTBLUE;
            out.push_back(status_light(color, "Glow"));
        }

Replacement in crawl-ref/source/mon-util.cc at line 3709 [7.1699344]
B:BD[14.13238] → [3.2954:3000]
```
bool monsters::backlit(bool check_halo) const
```
[14.13238]
[11.1029]
```
bool monsters::backlit(bool check_haloed) const
```

Replacement in crawl-ref/source/mon-util.cc at line 3712 [7.1699344]

B:BD[3.3038] → [3.3038:3094]

        || ((check_halo) ? inside_halo(x, y) : false));

[3.3038]

[15.13006]

        || ((check_haloed) ? haloed() : false));
}
bool monsters::haloed() const
{
    return (inside_halo(x, y));

Replacement in crawl-ref/source/externs.h at line 203 [7.3270163]

B:BD[14.86005] → [3.3194:3254]

    virtual bool backlit(bool check_halo = true) const = 0;

[14.86005]

    virtual bool backlit(bool check_haloed = true) const = 0;
    virtual bool haloed() const = 0;

Replacement in crawl-ref/source/externs.h at line 886 [7.3270163]

B:BD[15.25247] → [3.3255:3303]

    bool backlit(bool check_halo = true) const;

[15.25247]

[14.87516]

    bool backlit(bool check_haloed = true) const;
    bool haloed() const;

Replacement in crawl-ref/source/externs.h at line 1189 [7.3270163]

B:BD[14.89044] → [3.3304:3352]

    bool backlit(bool check_halo = true) const;

[14.89044]

    bool backlit(bool check_haloed = true) const;
    bool haloed() const;

Insertion in crawl-ref/source/direct.cc at line 2108 [7.3697945]

[16.1441]

[17.1290]

             mon->pronoun(PRONOUN_CAP).c_str());
    if (mon->haloed())
        mprf(MSGCH_EXAMINE, "%s is illuminated by a halo.",