fiddlerwoaroof/crawl - Change PGGTIZ45TMBWXSPYBPHTR4QW7B66WC2MQ7S4LEFMFSOFCEFLMT5AC

Move losight radius check into los_param.

Created by Robert Vollmert on October 8, 2009

PGGTIZ45TMBWXSPYBPHTR4QW7B66WC2MQ7S4LEFMFSOFCEFLMT5AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/losparam.h at line 27 [3.3217]

B:BD[3.3812] → [3.3812:3949]

    // Whether the translated coordinate lies in the map (including boundary)
    virtual bool map_bounds(const coord_def& p) const = 0;

[3.3812]

[3.3949]

    // Whether the translated coordinate lies within the map
    // (including boundary) and within the LOS area
    virtual bool los_bounds(const coord_def& p) const = 0;

Replacement in crawl-ref/source/losparam.h at line 31 [3.3217]

B:BD[3.3950] → [3.3950:4012]

    // appearance(p) will be copied to show(p) for visible p.

[3.3950]

[3.4012]

    // appearance(p) will be copied to show(sh_o+p) for visible p.

Replacement in crawl-ref/source/losparam.h at line 46 [3.3217]
B:BD[3.4355] → [3.4355:4402]
```
    bool map_bounds(const coord_def& p) const;
```
[3.4355]
[3.4402]
```
    bool los_bounds(const coord_def& p) const;
```
Insertion in crawl-ref/source/losparam.cc at line 13 [3.5319]
[3.5508]
[3.5508]
```
#include "los.h"
```
Replacement in crawl-ref/source/losparam.cc at line 27 [3.5319]
B:BD[3.5684] → [3.5684:5707]
```
    return p + center;
```
[3.5684]
[3.5707]
```
    return (p + center);
```

Replacement in crawl-ref/source/losparam.cc at line 30 [3.5319]

B:BD[3.5710] → [3.5710:5769]

bool los_param_trans::map_bounds(const coord_def& p) const

[3.5710]

[3.5769]

bool los_param_trans::los_bounds(const coord_def& p) const

Replacement in crawl-ref/source/losparam.cc at line 32 [3.5319]

B:BD[3.5771] → [3.5771:5806]

    return ::map_bounds(trans(p));

[3.5771]

[4.3291]

    return (map_bounds(trans(p)) && p.abs() <= get_los_radius_squared());

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

B:BD[3.7878] → [2.5841:5901]

            if (x == 0 && y == 0)
                continue;

Replacement in crawl-ref/source/los.cc at line 749 [5.26450]
B:BD[3.7927] → [3.7927:7963]
```
            if (!dat.map_bounds(p))
```
[3.7927]
[3.7963]
```
            if (!dat.los_bounds(p))
```

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

B:BD[3.9340] → [3.9340:9413]

                if (dat.map_bounds(p) && p.abs() <= _los_radius_squared)

[3.9340]

[5.54235]

                if (dat.los_bounds(p))