fiddlerwoaroof/crawl - Change KMF52RF3NIY2ABMHEZABT3GOG3KCHEJD55NBJ3IPAOHBKF2WPKQAC

Further find_ray simplification.

Ray length doesn't actually need to be computed; confirmed by the assert introduced in the previous commit not triggering.

Created by Robert Vollmert on October 15, 2009

KMF52RF3NIY2ABMHEZABT3GOG3KCHEJD55NBJ3IPAOHBKF2WPKQAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/los.cc at line 500 [5.26450]

B:BD[5.39615] → [5.39615:39726]

static bool _superior_ray(int shortest, int imbalance,
                          int raylen, int rayimbalance,

[5.39615]

[5.39726]

static bool _superior_ray(int imbalance, int rayimbalance,

Deletion in crawl-ref/source/los.cc at line 503 [5.26450]
B:BD[5.39796] → [5.39796:39861]
```
    if (shortest != raylen)
        return (shortest > raylen);
```

Replacement in crawl-ref/source/los.cc at line 563 [5.26450]

B:BD[3.3318] → [3.3318:3385]

                  ray_def& ray, int cycle_dir, bool find_shortest,

[3.3318]

[3.3385]

                  ray_def& ray, int cycle_dir, bool find_best,

Replacement in crawl-ref/source/los.cc at line 568 [5.26450]
∅:D[3.3498] → [5.41136:41177]
B:BD[5.41136] → [5.41136:41177]
```
    int shortest    = INFINITE_DISTANCE;
```
[3.3498]
[5.41177]
```
    bool found = false;
```
Insertion in crawl-ref/source/los.cc at line 572 [5.26450]
[5.41326]
[5.41326]
```
    double ray_slope_diff;
```
Replacement in crawl-ref/source/los.cc at line 586 [5.26450]
B:BD[6.3331] → [6.3331:3362]
```
            if (find_shortest)
```
[6.3331]
[6.3362]
```
            if (find_best)
```
Deletion in crawl-ref/source/los.cc at line 595 [5.26450]
B:BD[6.3598] → [6.3598:3631]
```
            int real_length = 0;
```
Replacement in crawl-ref/source/los.cc at line 605 [5.26450]
B:BD[5.42126] → [6.4044:4079]
```
                if (find_shortest)
```
[5.42126]
[5.42344]
```
                if (find_best)
```

Replacement in crawl-ref/source/los.cc at line 613 [5.26450]

B:BD[6.4357] → [6.4357:4479]

                        if ((c3 - c1).abs() != 2)
                            ++real_length;
                        else

[6.4357]

[5.42979]

                        if ((c3 - c1).abs() == 2)

Deletion in crawl-ref/source/los.cc at line 619 [5.26450]

B:BD[5.43697] → [6.4596:4660]

                    else
                        ++real_length;

Replacement in crawl-ref/source/los.cc at line 621 [5.26450]

B:BD[6.4710] → [6.4710:4767]

                    c1 = unaliased_ray[real_length - 1];

[6.4710]

[5.43697]

                    c1 = unaliased_ray[unaliased_ray.size() - 2];

Replacement in crawl-ref/source/los.cc at line 628 [5.26450]

B:BD[6.4911] → [6.4911:5037]

∅:D[7.3966] → [5.44500:44501]

∅:D[6.5037] → [5.44500:44501]

B:BD[5.44500] → [5.44500:44501]

B:BD[5.44501] → [6.5038:5158]

B:BD[6.5158] → [4.2841:2885]

            if (!blocked && find_shortest && shortest >= real_length)
                cimbalance = _imbalance(unaliased_ray);
            const double ray_slope_diff = find_shortest ?
                fabs(_slope_factor(lray) - want_slope) : 0.0;
            if (!blocked && find_shortest)

[6.4911]

[4.2885]

            if (!blocked && find_best)

Replacement in crawl-ref/source/los.cc at line 630 [5.26450]

B:BD[4.2899] → [4.2899:3019]

                // any unaliased ray should have the same length
                ASSERT(real_length == target.rdist());

[4.2899]

[4.3019]

                cimbalance = _imbalance(unaliased_ray);
                ray_slope_diff = fabs(_slope_factor(lray) - want_slope);

Replacement in crawl-ref/source/los.cc at line 634 [5.26450]

B:BD[5.45158] → [6.5159:5204]

B:BD[6.5204] → [2.3038:3170]

            if (blocked || (find_shortest &&
                            !_superior_ray(shortest, imbalance,
                                           real_length, cimbalance,

[5.45158]

[2.3170]

            if (blocked || (find_best &&
                            !_superior_ray(imbalance, cimbalance,

Insertion in crawl-ref/source/los.cc at line 642 [5.26450]
[6.5347]
[6.5347]
```
            found = true;
```
Deletion in crawl-ref/source/los.cc at line 647 [5.26450]
B:BD[5.45584] → [6.5423:5461]
```
            shortest   = real_length;
```
Replacement in crawl-ref/source/los.cc at line 650 [5.26450]
B:BD[6.5846] → [6.5846:5878]
```
            if (!find_shortest)
```
[5.45725]
[6.5878]
```
            if (!find_best)
```
Replacement in crawl-ref/source/los.cc at line 655 [5.26450]
B:BD[5.46205] → [5.46205:46261]
```
    if (find_shortest && shortest != INFINITE_DISTANCE)
```
[5.46205]
[5.46261]
```
    if (find_best && found)
```

Further find_ray simplification.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/los.cc at line 500 [5.26450]

Deletion in crawl-ref/source/los.cc at line 503 [5.26450]

Replacement in crawl-ref/source/los.cc at line 563 [5.26450]

Replacement in crawl-ref/source/los.cc at line 568 [5.26450]

Insertion in crawl-ref/source/los.cc at line 572 [5.26450]

Replacement in crawl-ref/source/los.cc at line 586 [5.26450]

Deletion in crawl-ref/source/los.cc at line 595 [5.26450]

Replacement in crawl-ref/source/los.cc at line 605 [5.26450]

Replacement in crawl-ref/source/los.cc at line 613 [5.26450]

Deletion in crawl-ref/source/los.cc at line 619 [5.26450]

Replacement in crawl-ref/source/los.cc at line 621 [5.26450]

Replacement in crawl-ref/source/los.cc at line 628 [5.26450]

Replacement in crawl-ref/source/los.cc at line 630 [5.26450]

Replacement in crawl-ref/source/los.cc at line 634 [5.26450]

Insertion in crawl-ref/source/los.cc at line 642 [5.26450]

Deletion in crawl-ref/source/los.cc at line 647 [5.26450]

Replacement in crawl-ref/source/los.cc at line 650 [5.26450]

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