fiddlerwoaroof/crawl - Change IOYLVGTLPFTKADPHYIWMXXD64HCW7UMR2P44M7K26ZLLEDBVMJQQC

Make default LOS configurable.

Setting LOS_RADIUS in defines.h now works. Fixed a couple of things to allow this, including an apparent off-by-one error in crawl_view – not quite sure this doesn't break anything.

Created by Robert Vollmert on October 17, 2009

IOYLVGTLPFTKADPHYIWMXXD64HCW7UMR2P44M7K26ZLLEDBVMJQQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.h at line 81 [5.13254]
B:BD[5.16497] → [5.16497:16527]
```
void setLOSRadius(int newLR);
```

Replacement in crawl-ref/source/view.cc at line 1802 [5.16817]

B:BD[6.362] → [2.6:80]

    if (you.hunger_state <= HS_NEAR_STARVING && dist > 65) // 8*8+1 (LOS)

[6.362]

[6.428]

    if (you.hunger_state <= HS_NEAR_STARVING && dist > get_los_radius_sq())

Replacement in crawl-ref/source/newgame.cc at line 1300 [5.1132300]
∅:D[7.3772] → [8.9229:9257]
B:BD[9.9603] → [8.9229:9257]
∅:D[8.9257] → [9.9630:9658]
B:BD[9.9630] → [9.9630:9658]
```
    you.normal_vision  = 8;
    you.current_vision = 8;
```
[7.3772]
[9.9658]
```
    you.normal_vision  = LOS_RADIUS;
    you.current_vision = LOS_RADIUS;
```
Replacement in crawl-ref/source/monstuff.cc at line 3560 [5.1396662]
B:BD[3.3472] → [3.3472:3525]
```
    if (distance(p1, p2) > get_los_radius_squared())
```
[3.3472]
[3.3525]
```
    if (distance(p1, p2) > get_los_radius_sq())
```

Replacement in crawl-ref/source/mon-los.cc at line 92 [10.13635]

B:BD[10.15560] → [10.15560:15625]

    if (distance(x, y, gridx, gridy) > get_los_radius_squared())

[10.15560]

[10.15625]

    if (distance(x, y, gridx, gridy) > get_los_radius_sq())

Replacement in crawl-ref/source/losparam.cc at line 68 [13.5319]
B:BD[11.3556] → [12.5272:5322]
```
    return (p.abs() <= get_los_radius_squared());
```
[11.3556]
[13.6783]
```
    return (p.abs() <= get_los_radius_sq());
```

Replacement in crawl-ref/source/los.h at line 16 [10.24780]

B:BD[10.24973] → [10.24973:25040]

void setLOSRadius(int newLR);
int get_los_radius_squared(); // XXX

[10.24972]

[10.25040]

void set_los_radius(int r);
int get_los_radius_sq(); // XXX

Replacement in crawl-ref/source/los.cc at line 80 [10.26450]

B:BD[10.27240] → [10.27240:27329]

const int sh_xo = 9;            // X and Y origins for the sh array
const int sh_yo = 9;

[10.27239]

[13.7363]

const int sh_xo = ENV_SHOW_OFFSET;            // X and Y origins for the sh array
const int sh_yo = ENV_SHOW_OFFSET;

Replacement in crawl-ref/source/los.cc at line 133 [10.26450]
B:BD[14.3552] → [4.3504:3545]
```
int _los_radius_squared = LOS_RADIUS_SQ;
```
[14.3552]
[10.27747]
```
int _los_radius_sq = LOS_RADIUS_SQ;
```
Replacement in crawl-ref/source/los.cc at line 135 [10.26450]
B:BD[10.27804] → [10.27804:27833]
```
void setLOSRadius(int newLR)
```
[10.27748]
[10.27833]
```
void set_los_radius(int r)
```

Replacement in crawl-ref/source/los.cc at line 137 [10.26450]

B:BD[10.27835] → [10.27835:27882]

    _los_radius_squared = newLR * newLR + 1*1;

[10.27835]

[10.27882]

    ASSERT(r <= LOS_MAX_RADIUS);
    _los_radius_sq = r * r + 1;

Replacement in crawl-ref/source/los.cc at line 142 [10.26450]
B:BD[10.27914] → [10.27914:27943]
```
int get_los_radius_squared()
```
[10.27914]
[10.27943]
```
int get_los_radius_sq()
```
Replacement in crawl-ref/source/los.cc at line 144 [10.26450]
B:BD[10.27945] → [10.27945:27977]
```
    return _los_radius_squared;
```
[10.27945]
[10.27977]
```
    return _los_radius_sq;
```
Insertion in crawl-ref/source/item_use.cc at line 39 [5.2781507]
[15.729059]
[16.4308]
```
#include "los.h"
```

Replacement in crawl-ref/source/item_use.cc at line 463 [5.2781507]

B:BD[17.305] → [17.305:351]

            setLOSRadius(you.current_vision);

[17.305]

[18.8045]

            set_los_radius(you.current_vision);

Insertion in crawl-ref/source/it_use2.cc at line 24 [5.2904329]
[19.35915]
[5.2905157]
```
#include "los.h"
```
Replacement in crawl-ref/source/it_use2.cc at line 476 [5.2904329]
B:BD[17.508] → [17.508:550]
```
        setLOSRadius(you.current_vision);
```
[17.508]
[18.13782]
```
        set_los_radius(you.current_vision);
```

Replacement in crawl-ref/source/initfile.cc at line 687 [5.2957258]

B:BD[20.5835] → [21.7235:7289]

    view_max_width   = 33;
    view_max_height  = 21;

[20.5835]

[22.5076]

    view_max_width   = std::max(33, VIEW_MIN_WIDTH);
    view_max_height  = std::max(21, VIEW_MIN_HEIGHT);

Replacement in crawl-ref/source/directn.h at line 241 [5.3696722]
B:BD[23.16583] → [23.16583:16638]
```
    return (pos - crawl_view.vlos1 + coord_def(1, 1));
```
[23.16583]
[24.5933355]
```
    return (pos - crawl_view.vlos1);
```
Replacement in crawl-ref/source/directn.h at line 246 [5.3696722]
B:BD[24.5933409] → [24.5933409:5933464]
```
    return (pos + crawl_view.vlos1 - coord_def(1, 1));
```
[24.5933409]
[25.997]
```
    return (pos + crawl_view.vlos1);
```

Replacement in crawl-ref/source/defines.h at line 109 [5.3982910]

B:BD[15.1020355] → [23.17946:17967]

#define LOS_RADIUS 8

[15.1020355]

[4.3791]

// default LOS radius
#define LOS_RADIUS 10
// default LOS radius squared, for comparison with distance()

Insertion in crawl-ref/source/defines.h at line 113 [5.3982910]
[4.3843]
[4.3843]
```
// maximal LOS radius
```

Replacement in crawl-ref/source/defines.h at line 116 [5.3982910]

B:BD[4.3941] → [4.3941:3975]

#define LOS_MAX_RADIUS LOS_RADIUS

[4.3941]

[4.3975]

// maximal horizontal or vertical LOS range:
//   a quadrant needs to fit inside an 2D array with
//     0 <= x, y <= LOS_MAX_RANGE

Replacement in crawl-ref/source/defines.h at line 120 [5.3982910]
B:BD[4.4012] → [4.4012:4056]
```
#define ENV_SHOW_OFFSET (LOS_MAX_RANGE + 1)
```
[4.4012]
[23.18008]
```
#define ENV_SHOW_OFFSET LOS_MAX_RANGE
```
Replacement in crawl-ref/source/defines.h at line 124 [5.3982910]
∅:D[26.11019] → [27.3010:3037]
B:BD[27.3010] → [27.3010:3037]
∅:D[27.3037] → [28.18693:18720]
B:BD[28.18693] → [28.18693:18720]
```
#define VIEW_MIN_WIDTH  17
#define VIEW_MIN_HEIGHT 17
```
[26.11019]
[29.11733]
```
#define VIEW_MIN_WIDTH  ENV_SHOW_DIAMETER
#define VIEW_MIN_HEIGHT ENV_SHOW_DIAMETER
```
Replacement in crawl-ref/source/defines.h at line 151 [5.3982910]
B:BD[15.1020996] → [26.11168:11201]
```
const int MONSTER_LOS_RANGE = 8;
```
[15.1020996]
[5.3984960]
```
const int MONSTER_LOS_RANGE = LOS_RADIUS;
```
Replacement in crawl-ref/source/acr.cc at line 3623 [5.4397395]
B:BD[30.4241] → [30.4241:4279]
```
    setLOSRadius(you.current_vision);
```
[30.4241]
[31.3653]
```
    set_los_radius(you.current_vision);
```

Make default LOS configurable.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.h at line 81 [5.13254]

Replacement in crawl-ref/source/view.cc at line 1802 [5.16817]

Replacement in crawl-ref/source/newgame.cc at line 1300 [5.1132300]

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

Replacement in crawl-ref/source/mon-los.cc at line 92 [10.13635]

Replacement in crawl-ref/source/losparam.cc at line 68 [13.5319]

Replacement in crawl-ref/source/los.h at line 16 [10.24780]

Replacement in crawl-ref/source/los.cc at line 80 [10.26450]

Replacement in crawl-ref/source/los.cc at line 133 [10.26450]

Replacement in crawl-ref/source/los.cc at line 135 [10.26450]

Replacement in crawl-ref/source/los.cc at line 137 [10.26450]

Replacement in crawl-ref/source/los.cc at line 142 [10.26450]

Replacement in crawl-ref/source/los.cc at line 144 [10.26450]

Insertion in crawl-ref/source/item_use.cc at line 39 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 463 [5.2781507]

Insertion in crawl-ref/source/it_use2.cc at line 24 [5.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 476 [5.2904329]

Replacement in crawl-ref/source/initfile.cc at line 687 [5.2957258]

Replacement in crawl-ref/source/directn.h at line 241 [5.3696722]

Replacement in crawl-ref/source/directn.h at line 246 [5.3696722]

Replacement in crawl-ref/source/defines.h at line 109 [5.3982910]

Insertion in crawl-ref/source/defines.h at line 113 [5.3982910]

Replacement in crawl-ref/source/defines.h at line 116 [5.3982910]

Replacement in crawl-ref/source/defines.h at line 120 [5.3982910]

Replacement in crawl-ref/source/defines.h at line 124 [5.3982910]

Replacement in crawl-ref/source/defines.h at line 151 [5.3982910]

Replacement in crawl-ref/source/acr.cc at line 3623 [5.4397395]