fiddlerwoaroof/crawl - Change TZ643KHSE5CUPXFSQ7VYVOCM5MTQ7F4SENEYQX2RNFHGHLQVS3RQC

Highlight monsters in the path of a beam (with :).

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

Created by dshaligram on June 2, 2007

TZ643KHSE5CUPXFSQ7VYVOCM5MTQ7F4SENEYQX2RNFHGHLQVS3RQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 123 [7.13254]

[5.225]

[6.316]

// Applies EC_ colour substitutions and brands.
unsigned real_colour(unsigned raw_colour);

Deletion in crawl-ref/source/view.cc at line 93 [7.16817]

B:BD[6.2991] → [6.2991:3089]


// Applies EC_ colour substitutions and brands.
static unsigned fix_colour(unsigned raw_colour);

Replacement in crawl-ref/source/view.cc at line 247 [7.16817]
B:BD[7.30151] → [6.5590:5638]
```
static unsigned fix_colour(unsigned raw_colour)
```
[7.30151]
[7.30558]
```
unsigned real_colour(unsigned raw_colour)
```
Replacement in crawl-ref/source/view.cc at line 315 [7.16817]
B:BD[7.35949] → [6.7159:7194]
```
    *colour = fix_colour(*colour);
```
[7.35949]
[6.7194]
```
    *colour = real_colour(*colour);
```
Replacement in crawl-ref/source/view.cc at line 329 [7.16817]
B:BD[8.479] → [8.479:514]
```
    *colour = fix_colour(*colour);
```
[8.479]
[8.514]
```
    *colour = real_colour(*colour);
```
Replacement in crawl-ref/source/view.cc at line 461 [7.16817]
B:BD[9.5804] → [6.8409:8440]
```
        return fix_colour(tc);
```
[9.5804]
[9.5825]
```
        return real_colour(tc);
```
Replacement in crawl-ref/source/view.cc at line 467 [7.16817]
B:BD[9.6313] → [6.8441:8472]
```
        return fix_colour(tc);
```
[9.6313]
[6.8687]
```
        return real_colour(tc);
```
Replacement in crawl-ref/source/view.cc at line 486 [7.16817]
B:BD[7.38489] → [6.9012:9039]
```
    return fix_colour(tc);
```
[7.38489]
[7.39963]
```
    return real_colour(tc);
```
Deletion in crawl-ref/source/view.cc at line 1657 [7.16817]
B:BD[6.29202] → [6.29202:29207]
```
    
```

Replacement in crawl-ref/source/view.cc at line 1691 [7.16817]

∅:D[4.3023] → [10.1161:1221]

B:BD[6.29880] → [10.1161:1221]

                for ( inray = 0; inray < cellray; ++inray )

[4.3023]

[10.1221]

                for ( inray = 0; inray <= cellray; ++inray )

Replacement in crawl-ref/source/view.cc at line 1695 [7.16817]

B:BD[4.3176] → [4.3176:3248]

                    if (grid_is_solid(grd[sourcex + xi][sourcey + yi]))

[4.3176]

[7.66790]

                    if (inray < cellray
                        && grid_is_solid(grd[sourcex + xi][sourcey + yi]))

Deletion in crawl-ref/source/view.cc at line 1726 [7.16817]

B:BD[7.67240] → [4.4251:4396]


                if (find_shortest)
                    unaliased_ray.push_back(
                        coord_def(signx * absx, signy * absy));

Insertion in crawl-ref/source/direct.h at line 50 [7.3696722]

[6.975046]

}
inline coord_def view2grid(const coord_def &pos)
{
    return coord_def( view2gridX(pos.x), view2gridY(pos.y) );

Insertion in crawl-ref/source/direct.h at line 67 [7.3696722]

[6.975197]

[7.3697903]

inline coord_def grid2view(const coord_def &pos)
{
    return coord_def( grid2viewX(pos.x), grid2viewY(pos.y) );
}

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

[11.9572]

    }
}
static void draw_ray_glyph(const coord_def &pos, int colour,
                           int glych, int mcol)
{
    int mid = mgrd(pos);
    if (mid != NON_MONSTER)
    {
        const monsters *mons = &menv[mid];
        if (mons->alive() && player_monster_visible(mons))
        {
            glych  = get_screen_glyph(pos.x, pos.y);
            colour = mcol;
        }

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

[11.9578]

    const coord_def vp = grid2view(pos);
    gotoxy(vp.x, vp.y);
    textcolor( real_colour(colour) );
    putch(glych);

Replacement in crawl-ref/source/direct.cc at line 753 [7.3697945]

B:BD[10.3871] → [10.3871:3942]

                 in_vlos(grid2viewX(moves.tx), grid2viewY(moves.ty)) )

[10.3871]

[10.3942]

                 in_vlos(grid2viewX(moves.tx), grid2viewY(moves.ty)) &&
                 moves.target() != you.pos() )

Replacement in crawl-ref/source/direct.cc at line 759 [7.3697945]

∅:D[12.2008] → [10.4031:4144]

B:BD[10.4031] → [10.4031:4144]

                textcolor(MAGENTA);
                while ( raycopy.x() != moves.tx || raycopy.y() != moves.ty )

[12.2008]

[10.4144]

                while ( raycopy.pos() != moves.target() )

Replacement in crawl-ref/source/direct.cc at line 761 [7.3697945]

B:BD[10.4162] → [10.4162:4242]

                    if ( raycopy.x() != you.x_pos || raycopy.y() != you.y_pos )

[10.4162]

[10.4242]

                    if ( raycopy.pos() != you.pos() )

Replacement in crawl-ref/source/direct.cc at line 766 [7.3697945]

B:BD[10.4364] → [2.1634:1691]

∅:D[2.1691] → [10.4425:4521]

B:BD[10.4425] → [10.4425:4521]

                        gotoxy( grid2viewX(raycopy.x()),
                                grid2viewY(raycopy.y()));
                        cprintf("*");

[10.4364]

[10.4521]

                        draw_ray_glyph(raycopy.pos(), MAGENTA, '*',
                                       MAGENTA | COLFLAG_REVERSE);

Replacement in crawl-ref/source/command.cc at line 565 [7.4082507]
B:BD[3.3833] → [3.3833:3862]
```
    "<w>:</w> : hide beam\n"
```
[3.3833]
[3.3862]
```
    "<w>:</w> : show/hide beam path\n"
```

Highlight monsters in the path of a beam (with :).

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.h at line 123 [7.13254]

Deletion in crawl-ref/source/view.cc at line 93 [7.16817]

Replacement in crawl-ref/source/view.cc at line 247 [7.16817]

Replacement in crawl-ref/source/view.cc at line 315 [7.16817]

Replacement in crawl-ref/source/view.cc at line 329 [7.16817]

Replacement in crawl-ref/source/view.cc at line 461 [7.16817]

Replacement in crawl-ref/source/view.cc at line 467 [7.16817]

Replacement in crawl-ref/source/view.cc at line 486 [7.16817]

Deletion in crawl-ref/source/view.cc at line 1657 [7.16817]