fiddlerwoaroof/crawl - Change XCL4GC6RUWUK57HONM5CRUEOCCECR4NYAI5KLPJKCYM5OURU3AYQC

[2781617] Fixing issue where targets in LOS but with no valid beam (i.e. through a statue) were being picked for firing targets. This could have been fixed by changing see_grid_no_trans to treat statues like clear walls (and then changing the reach code appropriately), but this still allows you to blink through a statue.

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

Created by ennewalker on May 1, 2009

XCL4GC6RUWUK57HONM5CRUEOCCECR4NYAI5KLPJKCYM5OURU3AYQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/directn.cc at line 998 [3.3697945]

[2.4605]

static bool _blocked_ray(const coord_def &where)
{
    ray_def ray;
    find_ray(you.pos(), where, true, ray, 0, true);
    ray.advance_through(where);
    while (ray.pos() != where)
    {
        if (grd(ray.pos()) <= DNGN_MINMOVE)
            return (true);
        ray.advance_through(where);
    }
    return (false);
}

Replacement in crawl-ref/source/directn.cc at line 1682 [3.3697945]

B:BD[4.6353] → [4.6353:6382]

B:BD[4.6382] → [5.95676:95738]

∅:D[6.46655] → [4.6461:6520]

∅:D[5.95738] → [4.6461:6520]

B:BD[4.6461] → [4.6461:6520]

        if (need_beam_redraw
            || show_beam && find_ray(you.pos(), moves.target,
                                     true, ray, 0, true) )

[4.6353]

[7.5934593]

        bool _draw_beam = find_ray(you.pos(), moves.target, true, ray, 0, true)
                          && show_beam && !_blocked_ray(moves.target);
        if (need_beam_redraw || _draw_beam)

Insertion in crawl-ref/source/directn.cc at line 1986 [3.3697945]

[8.4384]

[9.9257]

    if (need_path && _blocked_ray(mon->pos()))
        return (false);

Insertion in crawl-ref/source/directn.cc at line 2039 [3.3697945]

[10.3254]

[11.6070]

    if (need_path && _blocked_ray(mon->pos()))
        return (false);