fiddlerwoaroof/crawl - Change TZNURHCLTLE3A55EPNU66BU6NX7LOBA7EFG4NAJJBUKZLOAEFU4AC

Remove fallback calculation from find_ray.

There is now a separate fallback_ray() that needs to be called explicitly. I've manually converted uses of find_ray with allow_fallback == true.

find_ray with allow_fallback set always returned true, yet there were a number of places that used the return value, in particular in directn.cc. I'll check these later.

Created by Robert Vollmert on October 15, 2009

TZNURHCLTLE3A55EPNU66BU6NX7LOBA7EFG4NAJJBUKZLOAEFU4AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 2938 [9.3]

B:BD[8.2824] → [8.2824:2879]

    if (!find_ray(begin, towards, true, ray, 0, true))

[8.2824]

[8.2879]

    if (!find_ray(begin, towards, ray, 0, true))

Replacement in crawl-ref/source/spells4.cc at line 1372 [11.436250]
B:BD[10.288] → [2.273:327]
```
    if (!find_ray(you.pos(), spd.target, false, ray))
```
[10.288]
[10.344]
```
    if (!find_ray(you.pos(), spd.target, ray))
```

Replacement in crawl-ref/source/mon-los.cc at line 367 [12.13635]

B:BD[12.23072] → [12.23072:23188]

            find_ray( coord_def(gridx, gridy), coord_def(tx, ty),
                      true, ray, 0, true, true );

[12.23017]

[12.23188]

            if (!find_ray(coord_def(gridx, gridy), coord_def(tx, ty),
                          ray, 0, true, true))
                fallback_ray(coord_def(gridx, gridy), coord_def(tx, ty), ray);

Replacement in crawl-ref/source/los.h at line 21 [12.24780]

B:BD[12.25057] → [12.25057:25263]

bool find_ray( const coord_def& source, const coord_def& target,
               bool allow_fallback, ray_def& ray, int cycle_dir = 0,
               bool find_shortest = false, bool ignore_solid = false );

[12.25057]

[12.25263]

bool find_ray(const coord_def& source, const coord_def& target,
              ray_def& ray, int cycle_dir = 0, bool find_shortest = false,
              bool ignore_solid = false);
void fallback_ray(const coord_def& source, const coord_def& target,
                  ray_def& ray);

Replacement in crawl-ref/source/los.cc at line 562 [12.26450]

B:BD[13.3254] → [13.3254:3318]

B:BD[13.3318] → [6.2901:2964]

bool _find_ray_se(const coord_def& target, bool allow_fallback,
                  ray_def& ray, int cycle_dir, bool find_best,

[13.3254]

[13.3385]

bool _find_ray_se(const coord_def& target, ray_def& ray,
                  int cycle_dir, bool find_best,

Replacement in crawl-ref/source/los.cc at line 572 [12.26450]
B:BD[12.41326] → [6.2990:3017]
```
    double ray_slope_diff;
```
[12.41326]
[12.41326]
```
    double ray_slope_diff = slope_diff;
```
Deletion in crawl-ref/source/los.cc at line 654 [12.26450]
B:BD[12.46204] → [12.46204:46205]
B:BD[12.46205] → [6.3531:3559]
∅:D[6.3559] → [12.46261:46284]
B:BD[12.46261] → [12.46261:46284]
```
    if (find_best && found)
        return (true);
```

Replacement in crawl-ref/source/los.cc at line 655 [12.26450]

B:BD[12.46285] → [12.46285:46315]

B:BD[12.46315] → [7.2841:3108]

∅:D[7.3108] → [13.3873:3948]

B:BD[12.46315] → [13.3873:3948]

∅:D[13.3948] → [12.46415:46468]

∅:D[14.6014] → [12.46415:46468]

B:BD[12.46415] → [12.46415:46468]

B:BD[12.46468] → [13.3949:3995]

∅:D[13.3995] → [12.46715:46794]

∅:D[14.6180] → [12.46715:46794]

B:BD[12.46715] → [12.46715:46794]

    if (allow_fallback)
    {
#ifdef DEBUG_DIAGNOSTICS
        coord_def src = t.transform(coord_def(0,0));
        coord_def trg = t.transform(target);
        mprf(MSGCH_DIAGNOSTICS,
             "falling back in ray search: (%d,%d) to (%d,%d)",
             src.x, src.y, trg.x, trg.y);
#endif
        ray.accx = 0.5;
        ray.accy = 0.5;
        if (target.x == 0)
            ray.slope = VERTICAL_SLOPE;
        else
            ray.slope  = target.y / target.x;
        ray.fullray_idx = -1;
        return (true);
    }
    return (false);

[12.46285]

[12.46794]

    return (found);

Replacement in crawl-ref/source/los.cc at line 659 [12.26450]

B:BD[13.4061] → [13.4061:4178]

              bool allow_fallback, ray_def& ray, int cycle_dir,
              bool find_shortest, bool ignore_solid)

[13.4061]

[13.4178]

              ray_def& ray, int cycle_dir,
              bool find_best, bool ignore_solid)

Replacement in crawl-ref/source/los.cc at line 689 [12.26450]

B:BD[13.4727] → [13.4727:4841]

    if (!_find_ray_se(abs, allow_fallback, ray, cycle_dir,
                      find_shortest, ignore_solid, t))

[13.4727]

[13.4841]

    if (!_find_ray_se(abs, ray, cycle_dir, find_best, ignore_solid, t))

Insertion in crawl-ref/source/los.cc at line 703 [12.26450]

[13.5112]

}
void fallback_ray(const coord_def& source, const coord_def& target,
                  ray_def& ray)
{
    ray.accx = source.x + 0.5;
    ray.accy = source.y + 0.5;
    coord_def diff = target - source;
    ray.slope = _calc_slope(std::abs(diff.x), std::abs(diff.y));
    _set_ray_quadrant(ray, source.x, source.y, target.x, target.y);

Replacement in crawl-ref/source/los.cc at line 730 [12.26450]
B:BD[12.47539] → [12.47539:47598]
```
    find_ray( source, target, true, ray, 0, false, true );
```
[12.47539]
[12.47598]
```
    fallback_ray(source, target, ray);
```
Replacement in crawl-ref/source/l_los.cc at line 28 [15.4668]
B:BD[15.5140] → [16.3258:3304]
```
    if (find_ray(a, b, false, *ray, 0, true))
```
[15.5140]
[15.5186]
```
    if (find_ray(a, b, *ray, 0, true))
```

Replacement in crawl-ref/source/directn.cc at line 413 [11.3697945]

B:BD[17.20414] → [18.92381:92444]

        find_ray(you.pos(), moves.target, true, ray, 0, true);

[17.20414]

[17.20511]

        if (!find_ray(you.pos(), moves.target, ray, 0, true))
            fallback_ray(you.pos(), moves.target, ray);

Replacement in crawl-ref/source/directn.cc at line 450 [11.3697945]

B:BD[17.21226] → [18.92522:92585]

        find_ray(you.pos(), moves.target, true, ray, 0, true);

[17.21226]

[17.21323]

        if (!find_ray(you.pos(), moves.target, ray, 0, true))
            fallback_ray(you.pos(), moves.target, ray);

Replacement in crawl-ref/source/directn.cc at line 973 [11.3697945]

B:BD[19.2811] → [19.2811:2863]

    find_ray(you.pos(), where, true, ray, 0, true);

[19.2811]

[19.2863]

    if (!find_ray(you.pos(), where, ray, 0, true))
        fallback_ray(you.pos(), where, ray);

Replacement in crawl-ref/source/directn.cc at line 1054 [11.3697945]

B:BD[20.11955] → [18.92684:92738]

        find_ray(you.pos(), moves.target, true, ray);

[20.11955]

[21.160]

        if (!find_ray(you.pos(), moves.target, ray))
            fallback_ray(you.pos(), moves.target, ray);

Replacement in crawl-ref/source/directn.cc at line 1326 [11.3697945]

B:BD[22.2904] → [18.93588:93646]

∅:D[23.46167] → [22.2979:3045]

∅:D[18.93646] → [22.2979:3045]

B:BD[22.2979] → [22.2979:3045]

            show_beam = find_ray(you.pos(), moves.target,
                                 true, ray, (show_beam ? 1 : 0));

[22.2904]

[22.3045]

            // XXX: show_beam was conditional on find_ray
            //      with fallback succeeding.
            if (!find_ray(you.pos(), moves.target,
                          ray, (show_beam ? 1 : 0)))
                fallback_ray(you.pos(), moves.target, ray);
            show_beam = true;

Replacement in crawl-ref/source/directn.cc at line 1351 [11.3697945]

B:BD[24.7784] → [18.93647:93709]

∅:D[23.46232] → [25.8101:8159]

∅:D[18.93709] → [25.8101:8159]

B:BD[25.8101] → [25.8101:8159]

                show_beam = find_ray(you.pos(), moves.target,
                                     true, ray, 0, true);

[24.7784]

[25.8159]

                // XXX: show_beam was conditional on find_ray
                //      with fallback succeeding.
                if (!find_ray(you.pos(), moves.target,
                              ray, 0, true))
                    fallback_ray(you.pos(), moves.target, ray);
                show_beam = true;

Replacement in crawl-ref/source/directn.cc at line 1708 [11.3697945]

B:BD[3.6605] → [3.6605:6725]

                show_beam = find_ray(you.pos(), moves.target,
                                     true, ray, 0, true);

[3.6605]

[3.6725]

                // XXX: show_beam was conditional on find_ray
                //      with fallback succeeding.
                if (!find_ray(you.pos(), moves.target, ray, 0, true))
                    fallback_ray(you.pos(), moves.target, ray);

Replacement in crawl-ref/source/directn.cc at line 1737 [11.3697945]

B:BD[26.5934603] → [27.9860:10095]

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

[26.5934603]

[27.10095]

            if (show_beam)
            {
                if (!find_ray(you.pos(), moves.target, ray, 0, true))
                    fallback_ray(you.pos(), moves.target, ray);
                need_beam_redraw = !_blocked_ray(moves.target);
            }

Replacement in crawl-ref/source/decks.cc at line 1587 [11.3987460]
B:BD[28.15087] → [28.15087:15142]
```
    if (!find_ray(begin, towards, true, ray, 0, true))
```
[28.15087]
[28.15142]
```
    if (!find_ray(begin, towards, ray, 0, true))
```

Replacement in crawl-ref/source/beam.cc at line 1594 [11.4128068]

B:BD[29.11944] → [5.3219:3273]

        find_ray(source, target, true, ray, 0, true);

[29.11944]

[29.12065]

    {
        if (!find_ray(source, target, ray, 0, true))
            fallback_ray(source, target, ray);
    }

Replacement in crawl-ref/source/beam.cc at line 2850 [11.4128068]
B:BD[30.1235680] → [4.3631:3680]
```
    return find_ray(source, target, false, ray);
```
[30.1235680]
[30.1235731]
```
    return find_ray(source, target, ray);
```