fiddlerwoaroof/crawl - Change 3MCIHHM7HEXQPZHF2MZBUV3STJHRMVSUTWENFM3KUYIQXI5FJ2GAC

Simplify ray handling in directn.cc.

Existence of a valid ray is now tracked with a separate boolean have_beam. fallback_ray has been removed almost completely. The change appears fine in console crawl; tiles untested at the moment.

find_ray now correctly returns false for rays with source == target.

Also rename CMD_TARGET_HIDE_BEAM to CMD_TARGET_TOGGLE_BEAM.

Created by Robert Vollmert on October 15, 2009

3MCIHHM7HEXQPZHF2MZBUV3STJHRMVSUTWENFM3KUYIQXI5FJ2GAC

Dependencies

In channels

main

Change contents

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

B:BD[4.4671] → [2.3038:3136]

    {
        // XXX: directn expects true, even if the ray is invalid
        return true;
    }

[4.4671]

[4.4693]

        return false;

Replacement in crawl-ref/source/enum.h at line 664 [8.3287960]
∅:D[6.5947] → [7.2295:2321]
B:BD[7.2295] → [7.2295:2321]
```
    CMD_TARGET_HIDE_BEAM,
```
[6.5947]
[9.907737]
```
    CMD_TARGET_TOGGLE_BEAM,
```

Replacement in crawl-ref/source/directn.cc at line 412 [8.3697945]

B:BD[10.20393] → [10.20393:20414]

B:BD[10.20414] → [3.4227:4345]

∅:D[3.4345] → [10.20511:20536]

∅:D[11.45780] → [10.20511:20536]

∅:D[12.92444] → [10.20511:20536]

B:BD[10.20511] → [10.20511:20536]

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

[10.20393]

[10.20536]

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

Replacement in crawl-ref/source/directn.cc at line 447 [8.3697945]

B:BD[10.21205] → [10.21205:21226]

B:BD[10.21226] → [3.4346:4464]

∅:D[3.4464] → [10.21323:21348]

∅:D[11.45912] → [10.21323:21348]

∅:D[12.92585] → [10.21323:21348]

B:BD[10.21323] → [10.21323:21348]

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

[10.21205]

[10.21348]

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

Insertion in crawl-ref/source/directn.cc at line 965 [8.3697945]
[13.4605]
[14.2744]
```
// XXX: fold this into generalized find_ray.
```
Replacement in crawl-ref/source/directn.cc at line 1030 [8.3697945]
B:BD[15.5436] → [16.5966:6014]
```
        direction_choose_compass( moves, beh );
```
[15.5436]
[15.5479]
```
        direction_choose_compass(moves, beh);
```
Insertion in crawl-ref/source/directn.cc at line 1041 [8.3697945]
[17.1702]
[7.2776]
```
    bool have_beam = false;
```

Replacement in crawl-ref/source/directn.cc at line 1052 [8.3697945]

B:BD[18.11955] → [3.4562:4671]

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

[18.11955]

[19.160]

        have_beam = find_ray(you.pos(), moves.target, ray);

Deletion in crawl-ref/source/directn.cc at line 1320 [8.3697945]

B:BD[7.2904] → [3.4672:4940]

            // 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);

Insertion in crawl-ref/source/directn.cc at line 1321 [8.3697945]

[3.4970]

[7.3045]

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

Replacement in crawl-ref/source/directn.cc at line 1327 [8.3697945]
∅:D[20.7782] → [7.3114:3149]
B:BD[7.3114] → [7.3114:3149]
```
        case CMD_TARGET_HIDE_BEAM:
```
[20.7782]
[21.7860]
```
        case CMD_TARGET_TOGGLE_BEAM:
```

Replacement in crawl-ref/source/directn.cc at line 1342 [8.3697945]

B:BD[20.7784] → [3.4971:5247]

                // 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);

[20.7784]

[3.5247]

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

Replacement in crawl-ref/source/directn.cc at line 1345 [8.3697945]
∅:D[3.5281] → [21.8159:8205]
B:BD[21.8159] → [21.8159:8205]
```
                need_beam_redraw = show_beam;
```
[3.5281]
[21.8205]
```
                need_beam_redraw = true;
```

Replacement in crawl-ref/source/directn.cc at line 1410 [8.3697945]

B:BD[22.718] → [22.718:1157]

                        // We have to turn off show_beam, because
                        // when jumping to a previous target we don't
                        // care about the beam; otherwise Bad Things
                        // will happen because the ray is invalid,
                        // and we don't get a chance to update it before
                        // breaking from the loop.
                        show_beam = false;

[22.718]

[23.2644]

                        have_beam = false;

Replacement in crawl-ref/source/directn.cc at line 1666 [8.3697945]
∅:D[24.1672] → [7.3326:3370]
∅:D[25.5148] → [7.3326:3370]
B:BD[15.11912] → [7.3326:3370]
```
                moves.choseRay = show_beam;
```
[25.5148]
[7.3370]
```
                moves.choseRay = have_beam;
```
Deletion in crawl-ref/source/directn.cc at line 1671 [8.3697945]
B:BD[13.5470] → [13.5470:5484]
```
            {
```
Deletion in crawl-ref/source/directn.cc at line 1672 [8.3697945]
∅:D[13.5520] → [15.11935:11949]
B:BD[15.11935] → [15.11935:11949]
```
            }
```

Replacement in crawl-ref/source/directn.cc at line 1688 [8.3697945]

B:BD[26.6605] → [3.5282:5528]

                // 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);

[26.6605]

[26.6725]

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

Deletion in crawl-ref/source/directn.cc at line 1693 [8.3697945]
B:BD[8.3704189] → [27.838:839]
B:BD[27.839] → [28.11376:11402]
∅:D[28.11402] → [27.867:898]
B:BD[27.867] → [27.867:898]
```
        if (force_redraw)
            have_moved = true;
```
Replacement in crawl-ref/source/directn.cc at line 1694 [8.3697945]
B:BD[20.7879] → [28.11403:11427]
```
        if (have_moved)
```
[20.7879]
[8.3704202]
```
        if (have_moved || force_redraw)
```
Deletion in crawl-ref/source/directn.cc at line 1696 [8.3697945]
B:BD[8.3704212] → [24.1673:1747]
B:BD[24.1747] → [29.3137:3164]
∅:D[29.3164] → [7.3719:3761]
B:BD[7.3719] → [7.3719:3761]
```
            // If the target x,y has changed, the beam must have changed.
            if (show_beam)
                need_beam_redraw = true;
```

Replacement in crawl-ref/source/directn.cc at line 1707 [8.3697945]

B:BD[30.6353] → [31.9828:9859]

∅:D[32.3264] → [33.5934593:5934603]

∅:D[30.6520] → [33.5934593:5934603]

∅:D[34.7680] → [33.5934593:5934603]

∅:D[31.9859] → [33.5934593:5934603]

B:BD[33.5934593] → [33.5934593:5934603]

B:BD[33.5934603] → [3.5529:5782]

∅:D[3.5782] → [31.10095:10105]

B:BD[31.10095] → [31.10095:10105]

        if (!need_beam_redraw)
        {
            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);
            }
        }

[30.6353]

[31.10105]

        if (show_beam)
            need_beam_redraw = true;

Replacement in crawl-ref/source/directn.cc at line 1715 [8.3697945]

B:BD[33.5934617] → [28.11428:11454]

B:BD[28.11454] → [12.95739:95838]

            if (show_beam
                && in_vlos(grid2view(moves.target))
                && moves.target != you.pos() )

[33.5934617]

[7.3942]

            if (show_beam && have_beam)

Replacement in crawl-ref/source/directn.cc at line 1725 [8.3697945]

B:BD[7.4264] → [24.2009:2089]

B:BD[24.2089] → [11.46656:46708]

∅:D[29.3484] → [7.4329:4364]

∅:D[11.46708] → [7.4329:4364]

B:BD[7.4329] → [7.4329:4364]

                        // Sanity: don't loop forever if the ray is problematic
                        if (!in_los(raycopy.pos()))
                            break;

[7.4264]

[29.3485]

                        ASSERT(in_los(raycopy.pos()));

Replacement in crawl-ref/source/directn.cc at line 1986 [8.3697945]

B:BD[6.8458] → [35.4249:4364]

static bool _find_mlist( const coord_def& where, int idx, bool need_path,
                         int range = -1)

[6.8458]

[6.8538]

static bool _find_mlist(const coord_def& where, int idx, bool need_path,
                        int range = -1)

Replacement in crawl-ref/source/cmd-name.h at line 182 [36.12200]
B:BD[36.19405] → [36.19405:19453]
```
{CMD_TARGET_HIDE_BEAM, "CMD_TARGET_HIDE_BEAM"},
```
[36.19405]
[36.19453]
```
{CMD_TARGET_TOGGLE_BEAM, "CMD_TARGET_TOGGLE_BEAM"},
```
Replacement in crawl-ref/source/cmd-keys.h at line 169 [36.20639]
B:BD[36.23927] → [36.23927:23956]
```
{':', CMD_TARGET_HIDE_BEAM},
```
[36.23927]
[13.5742]
```
{':', CMD_TARGET_TOGGLE_BEAM},
```

Simplify ray handling in directn.cc.

Dependencies

In channels

Change contents

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

Replacement in crawl-ref/source/enum.h at line 664 [8.3287960]

Replacement in crawl-ref/source/directn.cc at line 412 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 447 [8.3697945]

Insertion in crawl-ref/source/directn.cc at line 965 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1030 [8.3697945]

Insertion in crawl-ref/source/directn.cc at line 1041 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1052 [8.3697945]

Deletion in crawl-ref/source/directn.cc at line 1320 [8.3697945]

Insertion in crawl-ref/source/directn.cc at line 1321 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1327 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1342 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1345 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1410 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1666 [8.3697945]

Deletion in crawl-ref/source/directn.cc at line 1671 [8.3697945]

Deletion in crawl-ref/source/directn.cc at line 1672 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1688 [8.3697945]

Deletion in crawl-ref/source/directn.cc at line 1693 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1694 [8.3697945]

Deletion in crawl-ref/source/directn.cc at line 1696 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1707 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1715 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1725 [8.3697945]

Replacement in crawl-ref/source/directn.cc at line 1986 [8.3697945]

Replacement in crawl-ref/source/cmd-name.h at line 182 [36.12200]

Replacement in crawl-ref/source/cmd-keys.h at line 169 [36.20639]