fiddlerwoaroof/crawl - Change FTJB2SJWYJSRV6CFEICSEAWWIJS6MVR5VEJWIWRMAGF2W74LGAUQC

Fix off-by-one and remove magic numbers.

Slight clean-up to random_near_space removing the magic numbers – they're in defines that maybe should move elsewhere.

Also fix another induced off-by-one error due to hard-coded show-view-offset.

Created by Robert Vollmert on October 18, 2009

FTJB2SJWYJSRV6CFEICSEAWWIJS6MVR5VEJWIWRMAGF2W74LGAUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 2630 [5.1396662]

B:BD[4.22710] → [4.22710:22773]

                       bool allow_adjacent, bool restrict_LOS,

[4.22710]

[2.3109]

                       bool allow_adjacent, bool restrict_los,

Replacement in crawl-ref/source/monstuff.cc at line 2635 [5.1396662]

B:BD[6.8434] → [7.3948:3984]

    FixedArray<bool, 13, 13> tried;

[6.8434]

[6.8470]

#define RNS_OFFSET 6
#define RNS_WIDTH (2*RNS_OFFSET + 1)
    FixedArray<bool, RNS_WIDTH, RNS_WIDTH> tried;
    const coord_def tried_o = coord_def(RNS_OFFSET, RNS_OFFSET);

Replacement in crawl-ref/source/monstuff.cc at line 2654 [5.1396662]
B:BD[8.4679] → [8.4679:4698]
∅:D[8.4698] → [6.9011:9037]
B:BD[6.9011] → [6.9011:9037]
```
    int tries = 0;
    while (tries++ < 150)
```
[8.4679]
[5.1429289]
```
    for (int tries = 0; tries < 150; tries++)
```

Replacement in crawl-ref/source/monstuff.cc at line 2656 [5.1396662]

B:BD[5.1429295] → [7.3985:4036]

        coord_def delta(random2(13), random2(13));

[5.1429295]

[6.9098]

        coord_def p = coord_def(random2(RNS_WIDTH), random2(RNS_WIDTH));
        if (tried(p))
            continue;
        else
            tried(p) = true;

Replacement in crawl-ref/source/monstuff.cc at line 2662 [5.1396662]
B:BD[6.9099] → [9.5823:5874]
```
        target = origin - coord_def(6, 6) + delta;
```
[6.9099]
[5.1429365]
```
        target = origin + (p - tried_o);
```
Deletion in crawl-ref/source/monstuff.cc at line 2667 [5.1396662]
B:BD[6.9174] → [6.9174:9175]
B:BD[6.9175] → [4.23176:23202]
∅:D[4.23202] → [6.9202:9225]
B:BD[6.9202] → [6.9202:9225]
B:BD[6.9225] → [4.23203:23232]
```
        if (tried(delta))
            continue;
        tried(delta) = true;
```

Replacement in crawl-ref/source/monstuff.cc at line 2669 [5.1396662]

B:BD[4.23264] → [3.6901:6950]

            || restrict_LOS && !see_cell(target)

[4.23264]

[4.23313]

            || restrict_los && !see_cell(target)

Replacement in crawl-ref/source/monstuff.cc at line 3356 [5.1396662]

B:BD[10.5746] → [10.5746:5810]

        const coord_def ep = *ri - you.pos() + coord_def(9, 9);

[10.5746]

[10.5810]

        // XXX: remove explicit coordinate translation.
        const coord_def ep = *ri - you.pos() + coord_def(ENV_SHOW_OFFSET,
                                                         ENV_SHOW_OFFSET);